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/inspector/InjectedScriptBase.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/JavaScriptCore/inspector/InjectedScriptBase.h')
| -rw-r--r-- | Source/JavaScriptCore/inspector/InjectedScriptBase.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.h b/Source/JavaScriptCore/inspector/InjectedScriptBase.h index 034e0c20a..55dd0e57d 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptBase.h +++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.h @@ -29,13 +29,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef InjectedScriptBase_h -#define InjectedScriptBase_h - -#if ENABLE(INSPECTOR) +#pragma once #include "InspectorEnvironment.h" -#include "InspectorJSTypeBuilders.h" +#include "InspectorProtocolObjects.h" #include "bindings/ScriptObject.h" #include <wtf/Forward.h> #include <wtf/RefPtr.h> @@ -62,13 +59,12 @@ protected: InspectorEnvironment* inspectorEnvironment() const { return m_environment; } - void initialize(Deprecated::ScriptObject, InspectorEnvironment*); bool hasAccessToInspectedScriptState() const; const Deprecated::ScriptObject& injectedScriptObject() const; - Deprecated::ScriptValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const; + JSC::JSValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const; void makeCall(Deprecated::ScriptFunctionCall&, RefPtr<InspectorValue>* result); - void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown); + void makeEvalCall(ErrorString&, Deprecated::ScriptFunctionCall&, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown, Protocol::OptOutput<int>* savedResult = nullptr); private: String m_name; @@ -77,7 +73,3 @@ private: }; } // namespace Inspector - -#endif // ENABLE(INSPECTOR) - -#endif // InjectedScriptBase_h |