From 32761a6cee1d0dee366b885b7b9c777e67885688 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Sun, 10 Apr 2016 09:28:39 +0000
Subject: webkitgtk-2.4.11

---
 Source/JavaScriptCore/inspector/InjectedScriptBase.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Source/JavaScriptCore/inspector/InjectedScriptBase.h')

diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.h b/Source/JavaScriptCore/inspector/InjectedScriptBase.h
index fd01fabd7..034e0c20a 100644
--- a/Source/JavaScriptCore/inspector/InjectedScriptBase.h
+++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.h
@@ -32,8 +32,10 @@
 #ifndef InjectedScriptBase_h
 #define InjectedScriptBase_h
 
+#if ENABLE(INSPECTOR)
+
 #include "InspectorEnvironment.h"
-#include "InspectorProtocolObjects.h"
+#include "InspectorJSTypeBuilders.h"
 #include "bindings/ScriptObject.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
@@ -60,12 +62,13 @@ 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<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown, Protocol::OptOutput<int>* savedResult = nullptr);
+    void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
 
 private:
     String m_name;
@@ -75,4 +78,6 @@ private:
 
 } // namespace Inspector
 
+#endif // ENABLE(INSPECTOR)
+
 #endif // InjectedScriptBase_h
-- 
cgit v1.2.1