diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-05-24 08:28:08 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-05-24 08:28:08 +0000 |
| commit | a4e969f4965059196ca948db781e52f7cfebf19e (patch) | |
| tree | 6ca352808c8fdc52006a0f33f6ae3c593b23867d /Source/JavaScriptCore/inspector/InjectedScriptBase.h | |
| parent | 41386e9cb918eed93b3f13648cbef387e371e451 (diff) | |
| download | WebKitGtk-tarball-a4e969f4965059196ca948db781e52f7cfebf19e.tar.gz | |
webkitgtk-2.12.3webkitgtk-2.12.3
Diffstat (limited to 'Source/JavaScriptCore/inspector/InjectedScriptBase.h')
| -rw-r--r-- | Source/JavaScriptCore/inspector/InjectedScriptBase.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.h b/Source/JavaScriptCore/inspector/InjectedScriptBase.h index 034e0c20a..fd01fabd7 100644 --- a/Source/JavaScriptCore/inspector/InjectedScriptBase.h +++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.h @@ -32,10 +32,8 @@ #ifndef InjectedScriptBase_h #define InjectedScriptBase_h -#if ENABLE(INSPECTOR) - #include "InspectorEnvironment.h" -#include "InspectorJSTypeBuilders.h" +#include "InspectorProtocolObjects.h" #include "bindings/ScriptObject.h" #include <wtf/Forward.h> #include <wtf/RefPtr.h> @@ -62,13 +60,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; 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; @@ -78,6 +75,4 @@ private: } // namespace Inspector -#endif // ENABLE(INSPECTOR) - #endif // InjectedScriptBase_h |