diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/JavaScriptCore/bindings/ScriptObject.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/JavaScriptCore/bindings/ScriptObject.h')
| -rw-r--r-- | Source/JavaScriptCore/bindings/ScriptObject.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/bindings/ScriptObject.h b/Source/JavaScriptCore/bindings/ScriptObject.h index 8f7b0dcdd..baa1ea8e0 100644 --- a/Source/JavaScriptCore/bindings/ScriptObject.h +++ b/Source/JavaScriptCore/bindings/ScriptObject.h @@ -29,8 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScriptObject_h -#define ScriptObject_h +#pragma once #include "JSObject.h" #include "ScriptValue.h" @@ -41,15 +40,15 @@ class ScriptObject : public ScriptValue { public: JS_EXPORT_PRIVATE ScriptObject(JSC::ExecState*, JSC::JSObject*); JS_EXPORT_PRIVATE ScriptObject(JSC::ExecState*, const ScriptValue&); - ScriptObject() : m_scriptState(nullptr) { } + ScriptObject() { } + + operator JSC::JSObject*() const { return jsObject(); } JSC::JSObject* jsObject() const { return asObject(jsValue()); } JSC::ExecState* scriptState() const { return m_scriptState; } -protected: - JSC::ExecState* m_scriptState; +private: + JSC::ExecState* m_scriptState { nullptr }; }; } // namespace Deprecated - -#endif // ScriptObject_h |