JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/inspector/JSGlobalObjectScriptDebugServer.h b/inspector/JSGlobalObjectScriptDebugServer.h
index d309e5913d46aa9f42a55f430f5d1143d5a0934f..901b67397b0ddf68303c13c6cfae099ff2d778d8 100644 (file)
--- a/inspector/JSGlobalObjectScriptDebugServer.h
+++ b/inspector/JSGlobalObjectScriptDebugServer.h
@@ -26,8 +26,6 @@
 #ifndef JSGlobalObjectScriptDebugServer_h
 #define JSGlobalObjectScriptDebugServer_h
 
 #ifndef JSGlobalObjectScriptDebugServer_h
 #define JSGlobalObjectScriptDebugServer_h
 

-#if ENABLE(INSPECTOR)
-

 #include "ScriptDebugServer.h"
 #include <wtf/Forward.h>
 
 #include "ScriptDebugServer.h"
 #include <wtf/Forward.h>
 


@@ -47,7 +45,7 @@ public:
     virtual void recompileAllJSFunctions() override;
 
 private:
     virtual void recompileAllJSFunctions() override;
 
 private:

-    virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) override { return &m_listeners; }
+    virtual ListenerSet& getListeners() override { return m_listeners; }

     virtual void didPause(JSC::JSGlobalObject*) override { }
     virtual void didContinue(JSC::JSGlobalObject*) override { }
     virtual void runEventLoopWhilePaused() override;
     virtual void didPause(JSC::JSGlobalObject*) override { }
     virtual void didContinue(JSC::JSGlobalObject*) override { }
     virtual void runEventLoopWhilePaused() override;


@@ -56,7 +54,7 @@ private:
     // NOTE: Currently all exceptions are reported at the API boundary through reportAPIException.
     // Until a time comes where an exception can be caused outside of the API (e.g. setTimeout
     // or some other async operation in a pure JSContext) we can ignore exceptions reported here.
     // NOTE: Currently all exceptions are reported at the API boundary through reportAPIException.
     // Until a time comes where an exception can be caused outside of the API (e.g. setTimeout
     // or some other async operation in a pure JSContext) we can ignore exceptions reported here.

-    virtual void reportException(JSC::ExecState*, JSC::JSValue) const override { }
+    virtual void reportException(JSC::ExecState*, JSC::Exception*) const override { }

 
     ListenerSet m_listeners;
     JSC::JSGlobalObject& m_globalObject;
 
     ListenerSet m_listeners;
     JSC::JSGlobalObject& m_globalObject;


@@ -64,6 +62,4 @@ private:
 
 } // namespace Inspector
 
 
 } // namespace Inspector
 

-#endif // ENABLE(INSPECTOR)
-

 #endif // JSGlobalObjectScriptDebugServer_h
 #endif // JSGlobalObjectScriptDebugServer_h