JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / inspector / agents / JSGlobalObjectRuntimeAgent.h

diff --git a/inspector/agents/JSGlobalObjectRuntimeAgent.h b/inspector/agents/JSGlobalObjectRuntimeAgent.h
index 0e72e09b278c67c70a306d2a4f5bbd6fa9f40d6b..631baec0eb33db9e089b5ccc1391b9580a7ff4e8 100644 (file)
--- a/inspector/agents/JSGlobalObjectRuntimeAgent.h
+++ b/inspector/agents/JSGlobalObjectRuntimeAgent.h
@@ -26,10 +26,7 @@
 #ifndef JSGlobalObjectRuntimeAgent_h
 #define JSGlobalObjectRuntimeAgent_h
 
-#if ENABLE(INSPECTOR)
-
 #include "InspectorRuntimeAgent.h"
-#include <wtf/PassOwnPtr.h>
 
 namespace JSC {
 class JSGlobalObject;
@@ -41,11 +38,11 @@ class JSGlobalObjectRuntimeAgent final : public InspectorRuntimeAgent {
 public:
     JSGlobalObjectRuntimeAgent(InjectedScriptManager*, JSC::JSGlobalObject&);
 
-    virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
-    virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
+    virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
+    virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
 
     virtual JSC::VM& globalVM() override;
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
+    virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
 
     // NOTE: JavaScript inspector does not yet need to mute a console because no messages
     // are sent to the console outside of the API boundary or console object.
@@ -53,13 +50,11 @@ public:
     virtual void unmuteConsole() override { }
 
 private:
-    std::unique_ptr<InspectorRuntimeFrontendDispatcher> m_frontendDispatcher;
-    RefPtr<InspectorRuntimeBackendDispatcher> m_backendDispatcher;
+    std::unique_ptr<RuntimeFrontendDispatcher> m_frontendDispatcher;
+    RefPtr<RuntimeBackendDispatcher> m_backendDispatcher;
     JSC::JSGlobalObject& m_globalObject;
 };
 
 } // namespace Inspector
 
-#endif // ENABLE(INSPECTOR)
-
 #endif // !defined(JSGlobalObjectRuntimeAgent_h)