JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / inspector / InjectedScriptBase.h

diff --git a/inspector/InjectedScriptBase.h b/inspector/InjectedScriptBase.h
index 034e0c20a4f8ec4a7b1426967c88903511d5db7b..06c3f5664a549900592a8b208c2d97dd94e79fd4 100644 (file)
--- a/inspector/InjectedScriptBase.h
+++ b/inspector/InjectedScriptBase.h
@@ -32,10 +32,8 @@
 #ifndef InjectedScriptBase_h
 #define InjectedScriptBase_h
 
 #ifndef InjectedScriptBase_h
 #define InjectedScriptBase_h
 

-#if ENABLE(INSPECTOR)
-

 #include "InspectorEnvironment.h"
 #include "InspectorEnvironment.h"

-#include "InspectorJSTypeBuilders.h"
+#include "InspectorProtocolObjects.h"

 #include "bindings/ScriptObject.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 #include "bindings/ScriptObject.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>


@@ -68,7 +66,7 @@ protected:
     const Deprecated::ScriptObject& injectedScriptObject() const;
     Deprecated::ScriptValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const;
     void makeCall(Deprecated::ScriptFunctionCall&, RefPtr<InspectorValue>* result);
     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;
 
 private:
     String m_name;


@@ -78,6 +76,4 @@ private:
 
 } // namespace Inspector
 
 
 } // namespace Inspector
 

-#endif // ENABLE(INSPECTOR)
-

 #endif // InjectedScriptBase_h
 #endif // InjectedScriptBase_h