Web Inspector: Move ScriptDebugServer::Task to WorkerScriptDebugServer where it is...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Nov 2015 21:37:40 +0000 (21:37 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Nov 2015 21:37:40 +0000 (21:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150847

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-11-03
Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

* inspector/ScriptDebugServer.h:
Remove Task from here, it isn't needed in the general case.

* parser/SourceProvider.h:
Remove unimplemented method.

Source/WebCore:

* bindings/js/WorkerScriptDebugServer.cpp:
(WebCore::WorkerScriptDebugServer::interruptAndRunTask):
* bindings/js/WorkerScriptDebugServer.h:
* inspector/WorkerDebuggerAgent.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/ScriptDebugServer.h
Source/JavaScriptCore/parser/SourceProvider.h
Source/WebCore/ChangeLog
Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
Source/WebCore/bindings/js/WorkerScriptDebugServer.h
Source/WebCore/inspector/WorkerDebuggerAgent.cpp

index 8da2415..ffda595 100644 (file)
@@ -1,5 +1,18 @@
 2015-11-03  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Move ScriptDebugServer::Task to WorkerScriptDebugServer where it is actually used
+        https://bugs.webkit.org/show_bug.cgi?id=150847
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/ScriptDebugServer.h:
+        Remove Task from here, it isn't needed in the general case.
+
+        * parser/SourceProvider.h:
+        Remove unimplemented method.
+
+2015-11-03  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Handle or Remove ParseHTML Timeline Event Records
         https://bugs.webkit.org/show_bug.cgi?id=150689
 
index b72af77..e9a99b7 100644 (file)
@@ -59,13 +59,6 @@ public:
 
     const BreakpointActions& getActionsForBreakpoint(JSC::BreakpointID);
 
-    class Task {
-        WTF_MAKE_FAST_ALLOCATED;
-    public:
-        virtual ~Task() { }
-        virtual void run() = 0;
-    };
-
 protected:
     typedef HashSet<ScriptDebugListener*> ListenerSet;
     typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
index 9183f14..4f984eb 100644 (file)
@@ -71,7 +71,6 @@ namespace JSC {
         void setSourceMappingURLDirective(const String& sourceMappingURL) { m_sourceMappingURLDirective = sourceMappingURL; }
 
         JS_EXPORT_PRIVATE void getID();
-        Vector<size_t>& lineStarts();
 
         String m_url;
         String m_sourceURLDirective;
index ea20e02..72acf71 100644 (file)
@@ -1,3 +1,15 @@
+2015-11-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Move ScriptDebugServer::Task to WorkerScriptDebugServer where it is actually used
+        https://bugs.webkit.org/show_bug.cgi?id=150847
+
+        Reviewed by Timothy Hatcher.
+
+        * bindings/js/WorkerScriptDebugServer.cpp:
+        (WebCore::WorkerScriptDebugServer::interruptAndRunTask):
+        * bindings/js/WorkerScriptDebugServer.h:
+        * inspector/WorkerDebuggerAgent.cpp:
+
 2015-11-03  Tim Horton  <timothy_horton@apple.com>
 
         Fix the build.
index 88b328c..ef59c40 100644 (file)
@@ -102,7 +102,7 @@ void WorkerScriptDebugServer::reportException(JSC::ExecState* exec, JSC::Excepti
     WebCore::reportException(exec, exception);
 }
 
-void WorkerScriptDebugServer::interruptAndRunTask(std::unique_ptr<ScriptDebugServer::Task>)
+void WorkerScriptDebugServer::interruptAndRunTask(std::unique_ptr<Task>)
 {
 }
 
index 80ed9d3..c9a01a7 100644 (file)
@@ -43,12 +43,19 @@ public:
     WorkerScriptDebugServer(WorkerGlobalScope&, const String&);
     ~WorkerScriptDebugServer() { }
 
+    class Task {
+        WTF_MAKE_FAST_ALLOCATED;
+    public:
+        virtual ~Task() { }
+        virtual void run() = 0;
+    };
+
     virtual void recompileAllJSFunctions() override;
 
     void addListener(Inspector::ScriptDebugListener*);
     void removeListener(Inspector::ScriptDebugListener*, bool skipRecompile);
 
-    void interruptAndRunTask(std::unique_ptr<ScriptDebugServer::Task>);
+    void interruptAndRunTask(std::unique_ptr<Task>);
 
 private:
     virtual ListenerSet& getListeners() override { return m_listeners; }
index 0644c05..cc844e3 100644 (file)
@@ -58,7 +58,7 @@ WorkerDebuggerAgents& workerDebuggerAgents()
     return agents;
 }
 
-class RunInspectorCommandsTask : public ScriptDebugServer::Task {
+class RunInspectorCommandsTask : public WorkerScriptDebugServer::Task {
 public:
     RunInspectorCommandsTask(WorkerThread* thread, WorkerGlobalScope* workerGlobalScope)
         : m_thread(thread)