Web Inspector: Remove untested and unused Worker inspection
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Dec 2015 18:50:05 +0000 (18:50 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Dec 2015 18:50:05 +0000 (18:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151848

Reviewed by Brian Burg.

Source/JavaScriptCore:

* CMakeLists.txt:
* DerivedSources.make:
* debugger/Debugger.cpp:
(JSC::Debugger::Debugger):
(JSC::Debugger::willExecuteProgram):
* debugger/Debugger.h:
* inspector/JSGlobalObjectScriptDebugServer.cpp:
(Inspector::JSGlobalObjectScriptDebugServer::JSGlobalObjectScriptDebugServer):
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::ScriptDebugServer):
* inspector/ScriptDebugServer.h:
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::run): Deleted.
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/agents/JSGlobalObjectConsoleAgent.h:
* inspector/protocol/Runtime.json:
* inspector/protocol/Worker.json: Removed.

Source/WebCore:

* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/WorkerScriptController.cpp:
* bindings/js/WorkerScriptDebugServer.cpp: Removed.
* bindings/js/WorkerScriptDebugServer.h: Removed.
* inspector/InspectorAllInOne.cpp:
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::addMessageToConsole):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController): Deleted.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::shouldPauseDedicatedWorkerOnStartImpl): Deleted.
(WebCore::InspectorInstrumentation::didStartWorkerGlobalScopeImpl): Deleted.
(WebCore::InspectorInstrumentation::willEvaluateWorkerScript): Deleted.
(WebCore::InspectorInstrumentation::workerGlobalScopeTerminatedImpl): Deleted.
(WebCore::InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope): Deleted.
(WebCore::InspectorInstrumentation::instrumentingAgentsForNonDocumentContext): Deleted.
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::instrumentingAgentsForContext):
(WebCore::InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart): Deleted.
(WebCore::InspectorInstrumentation::didStartWorkerGlobalScope): Deleted.
(WebCore::InspectorInstrumentation::workerGlobalScopeTerminated): Deleted.
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWebAgentBase.h:
(WebCore::WorkerAgentContext::WorkerAgentContext): Deleted.
* inspector/InspectorWorkerAgent.cpp: Removed.
* inspector/InspectorWorkerAgent.h: Removed.
* inspector/InspectorWorkerResource.h: Removed.
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::reset): Deleted.
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::workerRuntimeAgent): Deleted.
(WebCore::InstrumentingAgents::setWorkerRuntimeAgent): Deleted.
(WebCore::InstrumentingAgents::inspectorWorkerAgent): Deleted.
(WebCore::InstrumentingAgents::setInspectorWorkerAgent): Deleted.
* inspector/PageConsoleAgent.h:
* inspector/PageScriptDebugServer.cpp:
(WebCore::PageScriptDebugServer::PageScriptDebugServer):
* inspector/WorkerConsoleAgent.cpp: Removed.
* inspector/WorkerConsoleAgent.h: Removed.
* inspector/WorkerDebuggerAgent.cpp: Removed.
* inspector/WorkerDebuggerAgent.h: Removed.
* inspector/WorkerInspectorController.cpp: Removed.
* inspector/WorkerInspectorController.h: Removed.
* inspector/WorkerRuntimeAgent.cpp: Removed.
* inspector/WorkerRuntimeAgent.h: Removed.
* workers/Worker.cpp:
(WebCore::Worker::notifyFinished): Deleted.
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::WorkerGlobalScope): Deleted.
(WebCore::WorkerGlobalScope::~WorkerGlobalScope): Deleted.
* workers/WorkerGlobalScope.h:
(WebCore::WorkerGlobalScope::workerInspectorController): Deleted.
* workers/WorkerGlobalScopeProxy.h:
(WebCore::WorkerGlobalScopeProxy::PageInspector::~PageInspector): Deleted.
(WebCore::WorkerGlobalScopeProxy::connectToInspector): Deleted.
(WebCore::WorkerGlobalScopeProxy::disconnectFromInspector): Deleted.
(WebCore::WorkerGlobalScopeProxy::sendMessageToInspector): Deleted.
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::WorkerMessagingProxy): Deleted.
(WebCore::WorkerMessagingProxy::startWorkerGlobalScope): Deleted.
(WebCore::WorkerMessagingProxy::connectToInspector): Deleted.
(WebCore::WorkerMessagingProxy::disconnectFromInspector): Deleted.
(WebCore::WorkerMessagingProxy::sendMessageToInspector): Deleted.
(WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyedInternal): Deleted.
(WebCore::WorkerMessagingProxy::terminateWorkerGlobalScope): Deleted.
(WebCore::WorkerMessagingProxy::postMessageToPageInspector): Deleted.
* workers/WorkerMessagingProxy.h:
* workers/WorkerReportingProxy.h:
* workers/WorkerThread.cpp:
(WebCore::WorkerThread::workerThread): Deleted.

Source/WebInspectorUI:

* UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js:
* UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js:
* Versions/Inspector-iOS-7.0.json:
* Versions/Inspector-iOS-8.0.json:
* Versions/Inspector-iOS-9.0.json:
Since this was untested in older releases as well, remove
the protocol interfaces for legacy versions.

LayoutTests:

* inspector/debugger/pause-dedicated-worker-expected.txt: Removed.
* inspector/debugger/pause-dedicated-worker.html: Removed.
* inspector/debugger/resources/dedicated-worker.js: Removed.
* inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt: Removed.
* inspector/debugger/terminate-dedicated-worker-while-paused.html: Removed.

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

67 files changed:
LayoutTests/ChangeLog
LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt [deleted file]
LayoutTests/inspector/debugger/pause-dedicated-worker.html [deleted file]
LayoutTests/inspector/debugger/resources/dedicated-worker.js [deleted file]
LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt [deleted file]
LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html [deleted file]
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/DerivedSources.make
Source/JavaScriptCore/debugger/Debugger.cpp
Source/JavaScriptCore/debugger/Debugger.h
Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp
Source/JavaScriptCore/inspector/ScriptDebugServer.cpp
Source/JavaScriptCore/inspector/ScriptDebugServer.h
Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h
Source/JavaScriptCore/inspector/protocol/Runtime.json
Source/JavaScriptCore/inspector/protocol/Worker.json [deleted file]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
Source/WebCore/bindings/js/WorkerScriptController.cpp
Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp [deleted file]
Source/WebCore/bindings/js/WorkerScriptDebugServer.h [deleted file]
Source/WebCore/inspector/InspectorAllInOne.cpp
Source/WebCore/inspector/InspectorConsoleInstrumentation.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorTimelineAgent.cpp
Source/WebCore/inspector/InspectorTimelineAgent.h
Source/WebCore/inspector/InspectorWebAgentBase.h
Source/WebCore/inspector/InspectorWorkerAgent.cpp [deleted file]
Source/WebCore/inspector/InspectorWorkerAgent.h [deleted file]
Source/WebCore/inspector/InspectorWorkerResource.h [deleted file]
Source/WebCore/inspector/InstrumentingAgents.cpp
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/PageConsoleAgent.h
Source/WebCore/inspector/PageScriptDebugServer.cpp
Source/WebCore/inspector/WorkerConsoleAgent.cpp [deleted file]
Source/WebCore/inspector/WorkerConsoleAgent.h [deleted file]
Source/WebCore/inspector/WorkerDebuggerAgent.cpp [deleted file]
Source/WebCore/inspector/WorkerDebuggerAgent.h [deleted file]
Source/WebCore/inspector/WorkerInspectorController.cpp [deleted file]
Source/WebCore/inspector/WorkerInspectorController.h [deleted file]
Source/WebCore/inspector/WorkerRuntimeAgent.cpp [deleted file]
Source/WebCore/inspector/WorkerRuntimeAgent.h [deleted file]
Source/WebCore/workers/Worker.cpp
Source/WebCore/workers/WorkerGlobalScope.cpp
Source/WebCore/workers/WorkerGlobalScope.h
Source/WebCore/workers/WorkerGlobalScopeProxy.h
Source/WebCore/workers/WorkerMessagingProxy.cpp
Source/WebCore/workers/WorkerMessagingProxy.h
Source/WebCore/workers/WorkerReportingProxy.h
Source/WebCore/workers/WorkerThread.cpp
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js
Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js
Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js
Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json
Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json
Source/WebInspectorUI/Versions/Inspector-iOS-9.0.json

index 2f6ac1a..e124940 100644 (file)
@@ -1,5 +1,18 @@
 2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Remove untested and unused Worker inspection
+        https://bugs.webkit.org/show_bug.cgi?id=151848
+
+        Reviewed by Brian Burg.
+
+        * inspector/debugger/pause-dedicated-worker-expected.txt: Removed.
+        * inspector/debugger/pause-dedicated-worker.html: Removed.
+        * inspector/debugger/resources/dedicated-worker.js: Removed.
+        * inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt: Removed.
+        * inspector/debugger/terminate-dedicated-worker-while-paused.html: Removed.
+
+2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Specifically Identify the Global Lexical Environment Scope
         https://bugs.webkit.org/show_bug.cgi?id=151828
 
diff --git a/LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt b/LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt
deleted file mode 100644 (file)
index e412394..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Started worker
-Worker created
-didConnectToWorker
-SUCCESS: Worker paused
-
diff --git a/LayoutTests/inspector/debugger/pause-dedicated-worker.html b/LayoutTests/inspector/debugger/pause-dedicated-worker.html
deleted file mode 100644 (file)
index dde9f0f..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<html>
-<head>
-<script type="text/javascript" src="../../http/tests/inspector/resources/protocol-test.js"></script>
-<script>
-var worker;
-function startWorkerAndRunTest()
-{
-    worker = new Worker("resources/dedicated-worker.js");
-    worker.onmessage = function(event) { };
-    worker.postMessage(1);
-    log("Started worker");
-    runTest();
-}
-
-function test()
-{
-    var workerId;
-    var workerRequestId = 1;
-    function sendCommandToWorker(method, params)
-    {
-        InspectorProtocol.sendCommand("Worker.sendMessageToWorker", {
-            "workerId": workerId,
-            "message": {
-                "method": method,
-                "params": params,
-                "id": workerRequestId++
-            }
-        });
-    }
-
-    InspectorProtocol.sendCommand("Worker.enable", {}, function(messageObject) {
-        if ("error" in messageObject) {
-            ProtocolTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
-            ProtocolTest.completeTest();
-        }
-    });
-
-    InspectorProtocol.eventHandler["Worker.workerCreated"] = function(messageObject)
-    {
-        workerId = messageObject["params"]["workerId"];
-        ProtocolTest.log("Worker created");
-        InspectorProtocol.sendCommand("Worker.connectToWorker", { "workerId": workerId }, function(messageObject) {
-            ProtocolTest.log("didConnectToWorker");
-            sendCommandToWorker("Debugger.enable", {});
-            sendCommandToWorker("Debugger.pause", {});
-        });
-    }
-
-    InspectorProtocol.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
-    {
-        var message = messageObject["params"]["message"];
-        if (message["method"] === "Debugger.paused") {
-            ProtocolTest.log("SUCCESS: Worker paused");
-            sendCommandToWorker("Debugger.disable", {});
-            ProtocolTest.completeTest();
-        }
-    }
-}
-</script>
-</head>
-<body onLoad="startWorkerAndRunTest();">
-</body>
-</html>
diff --git a/LayoutTests/inspector/debugger/resources/dedicated-worker.js b/LayoutTests/inspector/debugger/resources/dedicated-worker.js
deleted file mode 100644 (file)
index 6e1f055..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-var message_id = 1;
-onmessage = function(event) {
-  doWork();
-};
-
-function doWork() {
-  postMessage("Message #" + message_id++);
-  setTimeout(doWork, 50);
-}
diff --git a/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt b/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt
deleted file mode 100644 (file)
index b68bb0f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Test that inspected page won't crash if inspected worker is terminated while it is paused. Test passes if it doesn't crash.
-
-Bug 101065.
-Started worker
-Worker created
-didConnectToWorker
-Worker paused
-SUCCESS: Did terminate paused worker
-
diff --git a/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html b/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html
deleted file mode 100644 (file)
index 864b1a4..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-<head>
-<script type="text/javascript" src="../../http/tests/inspector/resources/protocol-test.js"></script>
-<script>
-var worker;
-function startWorkerAndRunTest()
-{
-    worker = new Worker("resources/dedicated-worker.js");
-    worker.onmessage = function(event) { };
-    worker.postMessage(1);
-    log("Started worker");
-    runTest();
-}
-
-function test()
-{
-    var workerId;
-    var workerRequestId = 1;
-    function sendCommandToWorker(method, params)
-    {
-        InspectorProtocol.sendCommand("Worker.sendMessageToWorker", {
-            "workerId": workerId,
-            "message": {
-                "method": method,
-                "params": params,
-                "id": workerRequestId++
-            }
-        });
-    }
-
-    InspectorProtocol.sendCommand("Worker.enable", {}, function(messageObject) {
-        if ("error" in messageObject) {
-            ProtocolTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
-            ProtocolTest.completeTest();
-        }
-    });
-
-    InspectorProtocol.eventHandler["Worker.workerCreated"] = function(messageObject)
-    {
-        workerId = messageObject["params"]["workerId"];
-        ProtocolTest.log("Worker created");
-        InspectorProtocol.sendCommand("Worker.connectToWorker", {"workerId": workerId}, function(messageObject) {
-            ProtocolTest.log("didConnectToWorker");
-            sendCommandToWorker("Debugger.enable", {});
-            sendCommandToWorker("Debugger.pause", {});
-        });
-    }
-
-    InspectorProtocol.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
-    {
-        var message = messageObject["params"]["message"];
-        if (message["method"] === "Debugger.paused") {
-            ProtocolTest.log("Worker paused");
-            InspectorProtocol.sendCommand("Runtime.evaluate", {"expression": "worker.terminate()"}, function(messageObject) {
-                ProtocolTest.log("SUCCESS: Did terminate paused worker");
-                ProtocolTest.completeTest();
-            });
-        }
-    }
-}
-</script>
-</head>
-<body onLoad="startWorkerAndRunTest();">
-<p>Test that inspected page won't crash if inspected worker is terminated while it is paused. Test passes if it doesn't crash.</p>
-<a href="https://bugs.webkit.org/show_bug.cgi?id=101065">Bug 101065.</a>
-</body>
-</html>
index 94dde98..6d98bc3 100644 (file)
@@ -1159,7 +1159,6 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
     ${JAVASCRIPTCORE_DIR}/inspector/protocol/Page.json
     ${JAVASCRIPTCORE_DIR}/inspector/protocol/Runtime.json
     ${JAVASCRIPTCORE_DIR}/inspector/protocol/Timeline.json
-    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Worker.json
 )
 
 if (ENABLE_INDEXED_DATABASE)
index 1e8387e..c63aeb8 100644 (file)
@@ -1,5 +1,31 @@
 2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Remove untested and unused Worker inspection
+        https://bugs.webkit.org/show_bug.cgi?id=151848
+
+        Reviewed by Brian Burg.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * debugger/Debugger.cpp:
+        (JSC::Debugger::Debugger):
+        (JSC::Debugger::willExecuteProgram):
+        * debugger/Debugger.h:
+        * inspector/JSGlobalObjectScriptDebugServer.cpp:
+        (Inspector::JSGlobalObjectScriptDebugServer::JSGlobalObjectScriptDebugServer):
+        * inspector/ScriptDebugServer.cpp:
+        (Inspector::ScriptDebugServer::ScriptDebugServer):
+        * inspector/ScriptDebugServer.h:
+        * inspector/agents/InspectorConsoleAgent.h:
+        * inspector/agents/InspectorRuntimeAgent.cpp:
+        (Inspector::InspectorRuntimeAgent::run): Deleted.
+        * inspector/agents/InspectorRuntimeAgent.h:
+        * inspector/agents/JSGlobalObjectConsoleAgent.h:
+        * inspector/protocol/Runtime.json:
+        * inspector/protocol/Worker.json: Removed.
+
+2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Specifically Identify the Global Lexical Environment Scope
         https://bugs.webkit.org/show_bug.cgi?id=151828
 
index 768ebaa..8de726a 100644 (file)
@@ -194,7 +194,6 @@ INSPECTOR_DOMAINS = \
     $(JavaScriptCore)/inspector/protocol/Page.json \
     $(JavaScriptCore)/inspector/protocol/Runtime.json \
     $(JavaScriptCore)/inspector/protocol/Timeline.json \
-    $(JavaScriptCore)/inspector/protocol/Worker.json \
 #
 
 ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
index 7088318..5029b32 100644 (file)
@@ -113,14 +113,13 @@ private:
     Debugger& m_debugger;
 };
 
-Debugger::Debugger(VM& vm, bool isInWorkerThread)
+Debugger::Debugger(VM& vm)
     : m_vm(vm)
     , m_pauseOnExceptionsState(DontPauseOnExceptions)
     , m_pauseOnNextStatement(false)
     , m_isPaused(false)
     , m_breakpointsActivated(true)
     , m_hasHandlerForExceptionCallback(false)
-    , m_isInWorkerThread(isInWorkerThread)
     , m_suppressAllPauses(false)
     , m_steppingMode(SteppingModeDisabled)
     , m_reasonForPause(NotPaused)
@@ -707,13 +706,7 @@ void Debugger::willExecuteProgram(CallFrame* callFrame)
         return;
 
     PauseReasonDeclaration reason(*this, PausedAtStartOfProgram);
-    // FIXME: This check for whether we're debugging a worker thread is a workaround
-    // for https://bugs.webkit.org/show_bug.cgi?id=102637. Remove it when we rework
-    // the debugger implementation to not require callbacks.
-    if (!m_isInWorkerThread)
-        updateCallFrameAndPauseIfNeeded(callFrame);
-    else if (isStepping())
-        updateCallFrame(callFrame);
+    updateCallFrameAndPauseIfNeeded(callFrame);
 }
 
 void Debugger::didExecuteProgram(CallFrame* callFrame)
index 292b147..ae36f19 100644 (file)
@@ -44,7 +44,7 @@ typedef ExecState CallFrame;
 
 class JS_EXPORT_PRIVATE Debugger {
 public:
-    Debugger(VM&, bool isInWorkerThread = false);
+    Debugger(VM&);
     virtual ~Debugger();
 
     VM& vm() { return m_vm; }
@@ -198,7 +198,6 @@ private:
     bool m_isPaused : 1;
     bool m_breakpointsActivated : 1;
     bool m_hasHandlerForExceptionCallback : 1;
-    bool m_isInWorkerThread : 1;
     bool m_suppressAllPauses : 1;
     unsigned m_steppingMode : 1; // SteppingMode
 
index 6d8ce20..e9a28c1 100644 (file)
@@ -35,7 +35,7 @@ using namespace JSC;
 namespace Inspector {
 
 JSGlobalObjectScriptDebugServer::JSGlobalObjectScriptDebugServer(JSGlobalObject& globalObject)
-    : ScriptDebugServer(globalObject.vm(), false)
+    : ScriptDebugServer(globalObject.vm())
     , m_globalObject(globalObject)
 {
 }
index 4644630..89891bd 100644 (file)
@@ -46,8 +46,8 @@ using namespace JSC;
 
 namespace Inspector {
 
-ScriptDebugServer::ScriptDebugServer(VM& vm, bool isInWorkerThread)
-    : Debugger(vm, isInWorkerThread)
+ScriptDebugServer::ScriptDebugServer(VM& vm)
+    : Debugger(vm)
 {
 }
 
index e0670ff..ea210d3 100644 (file)
@@ -63,7 +63,7 @@ protected:
     typedef HashSet<ScriptDebugListener*> ListenerSet;
     typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
 
-    ScriptDebugServer(JSC::VM&, bool isInWorkerThread = false);
+    ScriptDebugServer(JSC::VM&);
     ~ScriptDebugServer();
 
     virtual void attachDebugger() = 0;
index 7e5cf80..0e228d9 100644 (file)
@@ -64,8 +64,6 @@ public:
     virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override = 0;
     virtual void addInspectedNode(ErrorString&, int nodeId) override = 0;
 
-    virtual bool isWorkerAgent() const = 0;
-
     bool enabled() const { return m_enabled; }
     void reset();
 
index 76048af..ffecfba 100644 (file)
@@ -241,11 +241,6 @@ void InspectorRuntimeAgent::releaseObjectGroup(ErrorString&, const String& objec
     m_injectedScriptManager.releaseObjectGroup(objectGroup);
 }
 
-void InspectorRuntimeAgent::run(ErrorString&)
-{
-    // FIXME: <https://webkit.org/b/127634> Web Inspector: support debugging web workers
-}
-
 void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString& errorString, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
 {
     static const bool verbose = false;
index 0e50b5a..e3385b9 100644 (file)
@@ -68,7 +68,6 @@ public:
     virtual void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) override final;
     virtual void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) override final;
     virtual void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
-    virtual void run(ErrorString&) override;
     virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
     virtual void enableTypeProfiler(ErrorString&) override;
     virtual void disableTypeProfiler(ErrorString&) override;
index a6f1e0e..f966e92 100644 (file)
@@ -41,8 +41,6 @@ public:
     // FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
     virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override;
     virtual void addInspectedNode(ErrorString&, int nodeId) override;
-
-    virtual bool isWorkerAgent() const override { return false; }
 };
 
 } // namespace Inspector
index 0bab1ce..af874d6 100644 (file)
             "description": "Releases all remote objects that belong to a given group."
         },
         {
-            "name": "run",
-            "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
-        },
-        {
             "name": "enable",
             "description": "Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context."
         },
diff --git a/Source/JavaScriptCore/inspector/protocol/Worker.json b/Source/JavaScriptCore/inspector/protocol/Worker.json
deleted file mode 100644 (file)
index 5269e13..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "domain": "Worker",
-    "types": [],
-    "availability": "web",
-    "commands": [
-        {
-            "name": "enable"
-        },
-        {
-            "name": "disable"
-        },
-        {
-            "name": "sendMessageToWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "message", "type": "object" }
-            ]
-        },
-        {
-            "name": "canInspectWorkers",
-            "description": "Tells whether browser supports workers inspection.",
-            "returns": [
-                { "name": "result", "type": "boolean", "description": "True if browser has workers support." }
-            ]
-        },
-        {
-            "name": "connectToWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "disconnectFromWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "setAutoconnectToWorkers",
-            "parameters": [
-                { "name": "value", "type": "boolean" }
-            ]
-        }
-    ],
-    "events": [
-        {
-            "name": "workerCreated",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "url", "type": "string" },
-                { "name": "inspectorConnected", "type": "boolean" }
-            ]
-        },
-        {
-            "name": "workerTerminated",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "dispatchMessageFromWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "message", "type": "object" }
-            ]
-        },
-        {
-            "name": "disconnectedFromWorker"
-        }
-    ]
-}
index d27b4bd..5014d34 100644 (file)
@@ -1259,7 +1259,6 @@ set(WebCore_SOURCES
     bindings/js/WebCoreJSBuiltins.cpp
     bindings/js/WebCoreTypedArrayController.cpp
     bindings/js/WorkerScriptController.cpp
-    bindings/js/WorkerScriptDebugServer.cpp
 
     bridge/IdentifierRep.cpp
     bridge/NP_jsobject.cpp
@@ -1899,7 +1898,6 @@ set(WebCore_SOURCES
     inspector/InspectorPageAgent.cpp
     inspector/InspectorStyleSheet.cpp
     inspector/InspectorTimelineAgent.cpp
-    inspector/InspectorWorkerAgent.cpp
     inspector/InstrumentingAgents.cpp
     inspector/NetworkResourcesData.cpp
     inspector/PageConsoleAgent.cpp
@@ -1911,10 +1909,6 @@ set(WebCore_SOURCES
     inspector/WebDebuggerAgent.cpp
     inspector/WebInjectedScriptHost.cpp
     inspector/WebInjectedScriptManager.cpp
-    inspector/WorkerConsoleAgent.cpp
-    inspector/WorkerDebuggerAgent.cpp
-    inspector/WorkerInspectorController.cpp
-    inspector/WorkerRuntimeAgent.cpp
 
     loader/ContentFilter.cpp
     loader/CookieJar.cpp
index 79fc879..9fadc24 100644 (file)
@@ -1,3 +1,85 @@
+2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Remove untested and unused Worker inspection
+        https://bugs.webkit.org/show_bug.cgi?id=151848
+
+        Reviewed by Brian Burg.
+
+        * CMakeLists.txt:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * bindings/js/WorkerScriptController.cpp:
+        * bindings/js/WorkerScriptDebugServer.cpp: Removed.
+        * bindings/js/WorkerScriptDebugServer.h: Removed.
+        * inspector/InspectorAllInOne.cpp:
+        * inspector/InspectorConsoleInstrumentation.h:
+        (WebCore::InspectorInstrumentation::addMessageToConsole):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController): Deleted.
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::shouldPauseDedicatedWorkerOnStartImpl): Deleted.
+        (WebCore::InspectorInstrumentation::didStartWorkerGlobalScopeImpl): Deleted.
+        (WebCore::InspectorInstrumentation::willEvaluateWorkerScript): Deleted.
+        (WebCore::InspectorInstrumentation::workerGlobalScopeTerminatedImpl): Deleted.
+        (WebCore::InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope): Deleted.
+        (WebCore::InspectorInstrumentation::instrumentingAgentsForNonDocumentContext): Deleted.
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::instrumentingAgentsForContext):
+        (WebCore::InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart): Deleted.
+        (WebCore::InspectorInstrumentation::didStartWorkerGlobalScope): Deleted.
+        (WebCore::InspectorInstrumentation::workerGlobalScopeTerminated): Deleted.
+        * inspector/InspectorTimelineAgent.h:
+        * inspector/InspectorWebAgentBase.h:
+        (WebCore::WorkerAgentContext::WorkerAgentContext): Deleted.
+        * inspector/InspectorWorkerAgent.cpp: Removed.
+        * inspector/InspectorWorkerAgent.h: Removed.
+        * inspector/InspectorWorkerResource.h: Removed.
+        * inspector/InstrumentingAgents.cpp:
+        (WebCore::InstrumentingAgents::reset): Deleted.
+        * inspector/InstrumentingAgents.h:
+        (WebCore::InstrumentingAgents::workerRuntimeAgent): Deleted.
+        (WebCore::InstrumentingAgents::setWorkerRuntimeAgent): Deleted.
+        (WebCore::InstrumentingAgents::inspectorWorkerAgent): Deleted.
+        (WebCore::InstrumentingAgents::setInspectorWorkerAgent): Deleted.
+        * inspector/PageConsoleAgent.h:
+        * inspector/PageScriptDebugServer.cpp:
+        (WebCore::PageScriptDebugServer::PageScriptDebugServer):
+        * inspector/WorkerConsoleAgent.cpp: Removed.
+        * inspector/WorkerConsoleAgent.h: Removed.
+        * inspector/WorkerDebuggerAgent.cpp: Removed.
+        * inspector/WorkerDebuggerAgent.h: Removed.
+        * inspector/WorkerInspectorController.cpp: Removed.
+        * inspector/WorkerInspectorController.h: Removed.
+        * inspector/WorkerRuntimeAgent.cpp: Removed.
+        * inspector/WorkerRuntimeAgent.h: Removed.
+        * workers/Worker.cpp:
+        (WebCore::Worker::notifyFinished): Deleted.
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::WorkerGlobalScope): Deleted.
+        (WebCore::WorkerGlobalScope::~WorkerGlobalScope): Deleted.
+        * workers/WorkerGlobalScope.h:
+        (WebCore::WorkerGlobalScope::workerInspectorController): Deleted.
+        * workers/WorkerGlobalScopeProxy.h:
+        (WebCore::WorkerGlobalScopeProxy::PageInspector::~PageInspector): Deleted.
+        (WebCore::WorkerGlobalScopeProxy::connectToInspector): Deleted.
+        (WebCore::WorkerGlobalScopeProxy::disconnectFromInspector): Deleted.
+        (WebCore::WorkerGlobalScopeProxy::sendMessageToInspector): Deleted.
+        * workers/WorkerMessagingProxy.cpp:
+        (WebCore::WorkerMessagingProxy::WorkerMessagingProxy): Deleted.
+        (WebCore::WorkerMessagingProxy::startWorkerGlobalScope): Deleted.
+        (WebCore::WorkerMessagingProxy::connectToInspector): Deleted.
+        (WebCore::WorkerMessagingProxy::disconnectFromInspector): Deleted.
+        (WebCore::WorkerMessagingProxy::sendMessageToInspector): Deleted.
+        (WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyedInternal): Deleted.
+        (WebCore::WorkerMessagingProxy::terminateWorkerGlobalScope): Deleted.
+        (WebCore::WorkerMessagingProxy::postMessageToPageInspector): Deleted.
+        * workers/WorkerMessagingProxy.h:
+        * workers/WorkerReportingProxy.h:
+        * workers/WorkerThread.cpp:
+        (WebCore::WorkerThread::workerThread): Deleted.
+
 2015-12-03  Sergio Villar Senin  <svillar@igalia.com>
 
         [css-grid] Fix height computation of grid items with borders inside fr tracks
index 92afbc4..6f27496 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\WorkerScriptDebugServer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\plugins\DOMMimeType.cpp" />
     <ClCompile Include="..\plugins\DOMMimeTypeArray.cpp" />
     <ClCompile Include="..\plugins\DOMPlugin.cpp" />
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\inspector\InspectorWorkerAgent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\inspector\InstrumentingAgents.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\inspector\WorkerConsoleAgent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\inspector\WorkerDebuggerAgent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\inspector\WorkerInspectorController.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\inspector\WorkerRuntimeAgent.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\mathml\MathMLAllInOne.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     <ClInclude Include="..\inspector\InspectorStyleSheet.h" />
     <ClInclude Include="..\inspector\InspectorTimelineAgent.h" />
     <ClInclude Include="..\inspector\InspectorWebAgentBase.h" />
-    <ClInclude Include="..\inspector\InspectorWorkerAgent.h" />
-    <ClInclude Include="..\inspector\InspectorWorkerResource.h" />
     <ClInclude Include="..\inspector\InstrumentingAgents.h" />
     <ClInclude Include="..\inspector\NetworkResourcesData.h" />
     <ClInclude Include="..\inspector\PageConsoleAgent.h" />
     <ClInclude Include="..\inspector\WebDebuggerAgent.h" />
     <ClInclude Include="..\inspector\WebInjectedScriptHost.h" />
     <ClInclude Include="..\inspector\WebInjectedScriptManager.h" />
-    <ClInclude Include="..\inspector\WorkerConsoleAgent.h" />
-    <ClInclude Include="..\inspector\WorkerDebuggerAgent.h" />
-    <ClInclude Include="..\inspector\WorkerInspectorController.h" />
-    <ClInclude Include="..\inspector\WorkerRuntimeAgent.h" />
     <ClInclude Include="..\mathml\MathMLElement.h" />
     <ClInclude Include="..\mathml\MathMLInlineContainerElement.h" />
     <ClInclude Include="..\mathml\MathMLMathElement.h" />
index 996acc8..9f21888 100644 (file)
     <ClCompile Include="..\bindings\js\WorkerScriptController.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\WorkerScriptDebugServer.cpp">
-      <Filter>bindings\js</Filter>
-    </ClCompile>
     <ClCompile Include="..\plugins\DOMMimeType.cpp">
       <Filter>plugins</Filter>
     </ClCompile>
     <ClCompile Include="..\inspector\InspectorTimelineAgent.cpp">
       <Filter>inspector</Filter>
     </ClCompile>
-    <ClCompile Include="..\inspector\InspectorWorkerAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
     <ClCompile Include="..\inspector\InstrumentingAgents.cpp">
       <Filter>inspector</Filter>
     </ClCompile>
     <ClCompile Include="..\inspector\WebInjectedScriptManager.cpp">
       <Filter>inspector</Filter>
     </ClCompile>
-    <ClCompile Include="..\inspector\WorkerConsoleAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
-    <ClCompile Include="..\inspector\WorkerDebuggerAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
-    <ClCompile Include="..\inspector\WorkerInspectorController.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
-    <ClCompile Include="..\inspector\WorkerRuntimeAgent.cpp">
-      <Filter>inspector</Filter>
-    </ClCompile>
     <ClCompile Include="..\mathml\MathMLAllInOne.cpp">
       <Filter>rendering\mathml</Filter>
     </ClCompile>
     <ClInclude Include="..\inspector\InspectorWebAgentBase.h">
       <Filter>inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\inspector\InspectorWorkerAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\inspector\InspectorWorkerResource.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
     <ClInclude Include="..\inspector\InstrumentingAgents.h">
       <Filter>inspector</Filter>
     </ClInclude>
     <ClInclude Include="..\inspector\WebInjectedScriptManager.h">
       <Filter>inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\inspector\WorkerConsoleAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\inspector\WorkerDebuggerAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\inspector\WorkerInspectorController.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
-    <ClInclude Include="..\inspector\WorkerRuntimeAgent.h">
-      <Filter>inspector</Filter>
-    </ClInclude>
     <ClInclude Include="..\mathml\MathMLElement.h">
       <Filter>rendering\mathml</Filter>
     </ClInclude>
index 6ff8229..98165c7 100644 (file)
                BC3BE9AB0E9C242000835588 /* RenderScrollbarPart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3BE9AA0E9C242000835588 /* RenderScrollbarPart.cpp */; };
                BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */; };
                BC3C39B70C0D3D8D005F4D7A /* JSMediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */; };
-               BC3D85BB1C0E2E7700D3B610 /* JSHTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC808B121C0E2B350066FD6B /* JSHTMLPictureElement.cpp */; settings = {ASSET_TAGS = (); }; };
-               BC3D85BC1C0E2E7A00D3B610 /* JSHTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC808B131C0E2B350066FD6B /* JSHTMLPictureElement.h */; settings = {ASSET_TAGS = (); }; };
+               BC3D85BB1C0E2E7700D3B610 /* JSHTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC808B121C0E2B350066FD6B /* JSHTMLPictureElement.cpp */; };
+               BC3D85BC1C0E2E7A00D3B610 /* JSHTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC808B131C0E2B350066FD6B /* JSHTMLPictureElement.h */; };
                BC4368E80C226E32005EFB5F /* Rect.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4368E70C226E32005EFB5F /* Rect.h */; };
                BC46C1EE0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */; };
                BC46C1FA0C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC46C1F00C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp */; };
                BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065840F3CE2A700CD2D87 /* JSClientRect.h */; };
                BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC065850F3CE2A700CD2D87 /* JSClientRectList.cpp */; };
                BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065860F3CE2A700CD2D87 /* JSClientRectList.h */; };
-               BCC0E8751BFE70E9008F7F50 /* HTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC0E8731BFE70E9008F7F50 /* HTMLPictureElement.cpp */; settings = {ASSET_TAGS = (); }; };
-               BCC0E8761BFE70E9008F7F50 /* HTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC0E8741BFE70E9008F7F50 /* HTMLPictureElement.h */; settings = {ASSET_TAGS = (); }; };
+               BCC0E8751BFE70E9008F7F50 /* HTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC0E8731BFE70E9008F7F50 /* HTMLPictureElement.cpp */; };
+               BCC0E8761BFE70E9008F7F50 /* HTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC0E8741BFE70E9008F7F50 /* HTMLPictureElement.h */; };
                BCC438780E886CC700533DD5 /* JSHTMLInputElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC438770E886CC700533DD5 /* JSHTMLInputElementCustom.cpp */; };
                BCC573350D695BBE006EF517 /* DOMProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC573330D695BBE006EF517 /* DOMProgressEvent.h */; };
                BCC573360D695BBE006EF517 /* DOMProgressEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC573340D695BBE006EF517 /* DOMProgressEvent.mm */; };
                F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */; };
                F34742DC134362F000531BC2 /* PageDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */; };
                F34742DD134362F000531BC2 /* PageDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F34742DB134362F000531BC2 /* PageDebuggerAgent.h */; };
-               F34742E01343631F00531BC2 /* WorkerDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */; };
-               F34742E11343631F00531BC2 /* WorkerDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */; };
-               F34742E81343635000531BC2 /* WorkerScriptDebugServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F34742E61343635000531BC2 /* WorkerScriptDebugServer.cpp */; };
-               F34742E91343635000531BC2 /* WorkerScriptDebugServer.h in Headers */ = {isa = PBXBuildFile; fileRef = F34742E71343635000531BC2 /* WorkerScriptDebugServer.h */; };
                F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F350B73413F1377D00880C43 /* InstrumentingAgents.cpp */; };
-               F36E07A41358A8BE00AACBC9 /* WorkerInspectorController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */; };
-               F36E07A51358A8BE00AACBC9 /* WorkerInspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */; };
-               F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */ = {isa = PBXBuildFile; fileRef = F375CC061150D300008DDB81 /* InspectorWorkerResource.h */; };
-               F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */; };
-               F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */; };
                F3820892147D35F90010BC06 /* PageConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */; };
                F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088B147D35F90010BC06 /* PageConsoleAgent.h */; };
                F3820894147D35F90010BC06 /* PageRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */; };
                F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088D147D35F90010BC06 /* PageRuntimeAgent.h */; };
-               F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */; };
-               F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */; };
-               F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */; };
-               F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */; };
                F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */; };
                F3D461481161D53200CA0D09 /* JSErrorHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */; };
                F3D461491161D53200CA0D09 /* JSErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D461471161D53200CA0D09 /* JSErrorHandler.h */; };
                F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontendClientLocal.cpp; sourceTree = "<group>"; };
                F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageDebuggerAgent.cpp; sourceTree = "<group>"; };
                F34742DB134362F000531BC2 /* PageDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageDebuggerAgent.h; sourceTree = "<group>"; };
-               F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerDebuggerAgent.cpp; sourceTree = "<group>"; };
-               F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerDebuggerAgent.h; sourceTree = "<group>"; };
-               F34742E61343635000531BC2 /* WorkerScriptDebugServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerScriptDebugServer.cpp; sourceTree = "<group>"; };
-               F34742E71343635000531BC2 /* WorkerScriptDebugServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerScriptDebugServer.h; sourceTree = "<group>"; };
                F350B73413F1377D00880C43 /* InstrumentingAgents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InstrumentingAgents.cpp; sourceTree = "<group>"; };
-               F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerInspectorController.cpp; sourceTree = "<group>"; };
-               F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerInspectorController.h; sourceTree = "<group>"; };
-               F375CC061150D300008DDB81 /* InspectorWorkerResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWorkerResource.h; sourceTree = "<group>"; };
-               F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWorkerAgent.cpp; sourceTree = "<group>"; };
-               F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWorkerAgent.h; sourceTree = "<group>"; };
                F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageConsoleAgent.cpp; sourceTree = "<group>"; };
                F382088B147D35F90010BC06 /* PageConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageConsoleAgent.h; sourceTree = "<group>"; };
                F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageRuntimeAgent.cpp; sourceTree = "<group>"; };
                F382088D147D35F90010BC06 /* PageRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageRuntimeAgent.h; sourceTree = "<group>"; };
-               F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerConsoleAgent.cpp; sourceTree = "<group>"; };
-               F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerConsoleAgent.h; sourceTree = "<group>"; };
-               F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerRuntimeAgent.cpp; sourceTree = "<group>"; };
-               F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerRuntimeAgent.h; sourceTree = "<group>"; };
                F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstrumentingAgents.h; sourceTree = "<group>"; };
                F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorHandler.cpp; sourceTree = "<group>"; };
                F3D461471161D53200CA0D09 /* JSErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorHandler.h; sourceTree = "<group>"; };
                                754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */,
                                754133A7102E00E800075D00 /* InspectorTimelineAgent.h */,
                                A593CF8A1840535200BFCE27 /* InspectorWebAgentBase.h */,
-                               F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */,
-                               F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */,
-                               F375CC061150D300008DDB81 /* InspectorWorkerResource.h */,
                                F350B73413F1377D00880C43 /* InstrumentingAgents.cpp */,
                                F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */,
                                59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */,
                                A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */,
                                A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
                                A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */,
-                               F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
-                               F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
-                               F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */,
-                               F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */,
-                               F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */,
-                               F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */,
-                               F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */,
-                               F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */,
                        );
                        path = inspector;
                        sourceTree = "<group>";
                                0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */,
                                E1A643FC0EC097A000779668 /* WorkerScriptController.cpp */,
                                E1A643F10EC0972500779668 /* WorkerScriptController.h */,
-                               F34742E61343635000531BC2 /* WorkerScriptDebugServer.cpp */,
-                               F34742E71343635000531BC2 /* WorkerScriptDebugServer.h */,
                        );
                        path = js;
                        sourceTree = "<group>";
                                82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
                                754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
                                A593CF8B1840535200BFCE27 /* InspectorWebAgentBase.h in Headers */,
-                               F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */,
-                               F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */,
                                F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */,
                                B27535720B053814002CE64F /* IntPoint.h in Headers */,
                                E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */,
                                A14832C6187F668F00DA63A6 /* WKViewPrivate.h in Headers */,
                                379919971200DDF400EA041C /* WOFFFileFormat.h in Headers */,
                                2E4346460F546A8200B0F1BA /* Worker.h in Headers */,
-                               F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */,
-                               F34742E11343631F00531BC2 /* WorkerDebuggerAgent.h in Headers */,
                                A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */,
                                2E4346490F546A8200B0F1BA /* WorkerGlobalScope.h in Headers */,
                                5185FCB41BB4C4E80012898F /* WorkerGlobalScopeIndexedDatabase.h in Headers */,
                                97F8E666151D4A4E00D2D181 /* WorkerGlobalScopeNotifications.h in Headers */,
                                2E43464B0F546A8200B0F1BA /* WorkerGlobalScopeProxy.h in Headers */,
-                               F36E07A51358A8BE00AACBC9 /* WorkerInspectorController.h in Headers */,
                                18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers */,
                                2E43464D0F546A8200B0F1BA /* WorkerLocation.h in Headers */,
                                2E4346500F546A8200B0F1BA /* WorkerMessagingProxy.h in Headers */,
                                2E4346510F546A8200B0F1BA /* WorkerObjectProxy.h in Headers */,
                                416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */,
                                2E4346530F546A8200B0F1BA /* WorkerRunLoop.h in Headers */,
-                               F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */,
                                E1A643F20EC0972500779668 /* WorkerScriptController.h in Headers */,
-                               F34742E91343635000531BC2 /* WorkerScriptDebugServer.h in Headers */,
                                A7D6B3490F61104500B79FD1 /* WorkerScriptLoader.h in Headers */,
                                2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */,
                                2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,
                                99CC0B6618BE9F15006CEBCC /* InspectorReplayAgent.cpp in Sources */,
                                82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
                                754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
-                               F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
                                F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */,
                                2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */,
                                B27535600B053814002CE64F /* IntPointCG.cpp in Sources */,
                                A14832C5187F668300DA63A6 /* WKView.mm in Sources */,
                                379919961200DDF400EA041C /* WOFFFileFormat.cpp in Sources */,
                                2E4346450F546A8200B0F1BA /* Worker.cpp in Sources */,
-                               F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */,
-                               F34742E01343631F00531BC2 /* WorkerDebuggerAgent.cpp in Sources */,
                                A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */,
                                2E4346480F546A8200B0F1BA /* WorkerGlobalScope.cpp in Sources */,
                                5185FCB31BB4C4E80012898F /* WorkerGlobalScopeIndexedDatabase.cpp in Sources */,
                                97F8E665151D4A4B00D2D181 /* WorkerGlobalScopeNotifications.cpp in Sources */,
-                               F36E07A41358A8BE00AACBC9 /* WorkerInspectorController.cpp in Sources */,
                                2E43464C0F546A8200B0F1BA /* WorkerLocation.cpp in Sources */,
                                2E43464F0F546A8200B0F1BA /* WorkerMessagingProxy.cpp in Sources */,
                                E1271A140EEEC80400F61213 /* WorkerNavigator.cpp in Sources */,
                                2E4346520F546A8200B0F1BA /* WorkerRunLoop.cpp in Sources */,
-                               F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */,
                                E1A643FD0EC097A000779668 /* WorkerScriptController.cpp in Sources */,
-                               F34742E81343635000531BC2 /* WorkerScriptDebugServer.cpp in Sources */,
                                A7D6B34A0F61104500B79FD1 /* WorkerScriptLoader.cpp in Sources */,
                                2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */,
                                0B9056F80F2685F30095FF6A /* WorkerThreadableLoader.cpp in Sources */,
index 0a4a836..fc96dd0 100644 (file)
 #include "SerializedScriptValue.cpp"
 #include "WebCoreTypedArrayController.cpp"
 #include "WorkerScriptController.cpp"
-#include "WorkerScriptDebugServer.cpp"
index 0eae64c..59f66ba 100644 (file)
@@ -34,7 +34,6 @@
 #include "WebCoreJSClientData.h"
 #include "WorkerGlobalScope.h"
 #include "WorkerObjectProxy.h"
-#include "WorkerScriptDebugServer.h"
 #include "WorkerThread.h"
 #include <bindings/ScriptValue.h>
 #include <heap/StrongInlines.h>
diff --git a/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp b/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
deleted file mode 100644 (file)
index ea859a9..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc. All rights reserved.
- * Copyright (c) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkerScriptDebugServer.h"
-
-#include "JSDOMBinding.h"
-#include "Timer.h"
-#include "WorkerDebuggerAgent.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerRunLoop.h"
-#include "WorkerThread.h"
-#include <runtime/VM.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-WorkerScriptDebugServer::WorkerScriptDebugServer(WorkerGlobalScope& context, const String& mode)
-    : ScriptDebugServer(context.script()->vm(), true)
-    , m_workerGlobalScope(context)
-    , m_debuggerTaskMode(mode)
-{
-}
-
-void WorkerScriptDebugServer::attachDebugger()
-{
-    m_workerGlobalScope.script()->attachDebugger(this);
-    recompileAllJSFunctions();
-}
-
-void WorkerScriptDebugServer::detachDebugger(bool skipRecompile)
-{
-    if (m_workerGlobalScope.script())
-        m_workerGlobalScope.script()->detachDebugger(this);
-    if (!skipRecompile)
-        recompileAllJSFunctions();
-}
-
-void WorkerScriptDebugServer::recompileAllJSFunctions()
-{
-    JSC::JSLockHolder lock(vm());
-    JSC::Debugger::recompileAllJSFunctions();
-}
-
-void WorkerScriptDebugServer::runEventLoopWhilePaused()
-{
-    TimerBase::fireTimersInNestedEventLoop();
-
-    MessageQueueWaitResult result;
-    do {
-        result = m_workerGlobalScope.thread().runLoop().runInMode(&m_workerGlobalScope, m_debuggerTaskMode);
-    // Keep waiting until execution is resumed.
-    } while (result != MessageQueueTerminated && !m_doneProcessingDebuggerEvents);
-}
-
-void WorkerScriptDebugServer::reportException(JSC::ExecState* exec, JSC::Exception* exception) const
-{
-    WebCore::reportException(exec, exception);
-}
-
-void WorkerScriptDebugServer::interruptAndRunTask(std::unique_ptr<Task>)
-{
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/bindings/js/WorkerScriptDebugServer.h b/Source/WebCore/bindings/js/WorkerScriptDebugServer.h
deleted file mode 100644 (file)
index a3198ab..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WorkerScriptDebugServer_h
-#define WorkerScriptDebugServer_h
-
-#include <inspector/ScriptDebugServer.h>
-
-namespace WebCore {
-
-class WorkerGlobalScope;
-
-class WorkerScriptDebugServer final : public Inspector::ScriptDebugServer {
-    WTF_MAKE_NONCOPYABLE(WorkerScriptDebugServer);
-public:
-    WorkerScriptDebugServer(WorkerGlobalScope&, const String&);
-    ~WorkerScriptDebugServer() { }
-
-    class Task {
-        WTF_MAKE_FAST_ALLOCATED;
-    public:
-        virtual ~Task() { }
-        virtual void run() = 0;
-    };
-
-    virtual void recompileAllJSFunctions() override;
-
-    void interruptAndRunTask(std::unique_ptr<Task>);
-
-private:
-    virtual void attachDebugger() override;
-    virtual void detachDebugger(bool isBeingDestroyed) override;
-
-    virtual void didPause(JSC::JSGlobalObject*) override { }
-    virtual void didContinue(JSC::JSGlobalObject*) override { }
-    virtual void runEventLoopWhilePaused() override;
-    virtual bool isContentScript(JSC::ExecState*) const override { return false; }
-    virtual void reportException(JSC::ExecState*, JSC::Exception*) const override;
-
-    WorkerGlobalScope& m_workerGlobalScope;
-    String m_debuggerTaskMode;
-};
-
-} // namespace WebCore
-
-#endif // WorkerScriptDebugServer_h
index 37c984c..6e1beea 100644 (file)
@@ -50,7 +50,6 @@
 #include "InspectorPageAgent.cpp"
 #include "InspectorStyleSheet.cpp"
 #include "InspectorTimelineAgent.cpp"
-#include "InspectorWorkerAgent.cpp"
 #include "InstrumentingAgents.cpp"
 #include "NetworkResourcesData.cpp"
 #include "PageConsoleAgent.cpp"
@@ -62,7 +61,3 @@
 #include "WebDebuggerAgent.cpp"
 #include "WebInjectedScriptHost.cpp"
 #include "WebInjectedScriptManager.cpp"
-#include "WorkerConsoleAgent.cpp"
-#include "WorkerDebuggerAgent.cpp"
-#include "WorkerInspectorController.cpp"
-#include "WorkerRuntimeAgent.cpp"
index 27737e3..b915e97 100644 (file)
@@ -44,10 +44,9 @@ inline void InspectorInstrumentation::addMessageToConsole(Page& page, std::uniqu
     addMessageToConsoleImpl(instrumentingAgentsForPage(page), WTF::move(message));
 }
 
-inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, std::unique_ptr<Inspector::ConsoleMessage> message)
+inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope*, std::unique_ptr<Inspector::ConsoleMessage>)
 {
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForWorkerGlobalScope(workerGlobalScope))
-        addMessageToConsoleImpl(*instrumentingAgents, WTF::move(message));
+    // FIXME: <https://webkit.org/b/127634> Web Inspector: support debugging web workers
 }
 
 inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments)
index 3397600..e66d418 100644 (file)
@@ -50,7 +50,6 @@
 #include "InspectorPageAgent.h"
 #include "InspectorReplayAgent.h"
 #include "InspectorTimelineAgent.h"
-#include "InspectorWorkerAgent.h"
 #include "InstrumentingAgents.h"
 #include "JSDOMWindow.h"
 #include "JSDOMWindowCustom.h"
@@ -153,7 +152,7 @@ InspectorController::InspectorController(Page& page, InspectorClient* inspectorC
     InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get();
     m_agents.append(WTF::move(domStorageAgentPtr));
 
-    auto timelineAgentPtr = std::make_unique<InspectorTimelineAgent>(pageContext, pageAgent, InspectorTimelineAgent::PageInspector);
+    auto timelineAgentPtr = std::make_unique<InspectorTimelineAgent>(pageContext, pageAgent);
     m_timelineAgent = timelineAgentPtr.get();
     m_agents.append(WTF::move(timelineAgentPtr));
 
@@ -169,7 +168,6 @@ InspectorController::InspectorController(Page& page, InspectorClient* inspectorC
     m_agents.append(std::make_unique<InspectorDOMDebuggerAgent>(pageContext, m_domAgent, debuggerAgent));
     m_agents.append(std::make_unique<InspectorHeapAgent>(pageContext));
     m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(pageContext, pageAgent));
-    m_agents.append(std::make_unique<InspectorWorkerAgent>(pageContext));
     m_agents.append(std::make_unique<InspectorLayerTreeAgent>(pageContext));
 
     ASSERT(m_injectedScriptManager->commandLineAPIHost());
index e527daa..1ad07fe 100644 (file)
@@ -51,7 +51,6 @@
 #include "InspectorNetworkAgent.h"
 #include "InspectorPageAgent.h"
 #include "InspectorTimelineAgent.h"
-#include "InspectorWorkerAgent.h"
 #include "InstrumentingAgents.h"
 #include "MainFrame.h"
 #include "PageDebuggerAgent.h"
 #include "StyleResolver.h"
 #include "StyleRule.h"
 #include "WebConsoleAgent.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerInspectorController.h"
-#include "WorkerRuntimeAgent.h"
-#include "WorkerThread.h"
 #include "XMLHttpRequest.h"
 #include <inspector/ConsoleMessage.h>
 #include <inspector/ScriptArguments.h>
@@ -911,38 +906,6 @@ void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgent
         domStorageAgent->didDispatchDOMStorageEvent(key, oldValue, newValue, storageType, securityOrigin, page);
 }
 
-bool InspectorInstrumentation::shouldPauseDedicatedWorkerOnStartImpl(InstrumentingAgents& instrumentingAgents)
-{
-    if (InspectorWorkerAgent* workerAgent = instrumentingAgents.inspectorWorkerAgent())
-        return workerAgent->shouldPauseDedicatedWorkerOnStart();
-    return false;
-}
-
-void InspectorInstrumentation::didStartWorkerGlobalScopeImpl(InstrumentingAgents& instrumentingAgents, WorkerGlobalScopeProxy* workerGlobalScopeProxy, const URL& url)
-{
-    if (InspectorWorkerAgent* workerAgent = instrumentingAgents.inspectorWorkerAgent())
-        workerAgent->didStartWorkerGlobalScope(workerGlobalScopeProxy, url);
-}
-
-void InspectorInstrumentation::willEvaluateWorkerScript(WorkerGlobalScope* workerGlobalScope, int workerThreadStartMode)
-{
-    if (workerThreadStartMode != PauseWorkerGlobalScopeOnStart)
-        return;
-
-    InstrumentingAgents* instrumentingAgents = instrumentingAgentsForWorkerGlobalScope(workerGlobalScope);
-    if (!instrumentingAgents)
-        return;
-
-    if (WorkerRuntimeAgent* runtimeAgent = instrumentingAgents->workerRuntimeAgent())
-        runtimeAgent->pauseWorkerGlobalScope(workerGlobalScope);
-}
-
-void InspectorInstrumentation::workerGlobalScopeTerminatedImpl(InstrumentingAgents& instrumentingAgents, WorkerGlobalScopeProxy* proxy)
-{
-    if (InspectorWorkerAgent* workerAgent = instrumentingAgents.inspectorWorkerAgent())
-        workerAgent->workerGlobalScopeTerminated(proxy);
-}
-
 #if ENABLE(WEB_SOCKETS)
 void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const URL& requestURL)
 {
@@ -1199,19 +1162,6 @@ InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForRenderer(Re
     return instrumentingAgentsForFrame(renderer->frame());
 }
 
-InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
-{
-    return workerGlobalScope ? &workerGlobalScope->workerInspectorController().m_instrumentingAgents.get() : nullptr;
-}
-
-InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForNonDocumentContext(ScriptExecutionContext* context)
-{
-    ASSERT(context);
-    if (is<WorkerGlobalScope>(*context))
-        return instrumentingAgentsForWorkerGlobalScope(downcast<WorkerGlobalScope>(context));
-    return nullptr;
-}
-
 void InspectorInstrumentation::layerTreeDidChangeImpl(InstrumentingAgents& instrumentingAgents)
 {
     if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents.inspectorLayerTreeAgent())
index 696d824..1b4f3c6 100644 (file)
@@ -100,7 +100,6 @@ class StyleRule;
 class ThreadableLoaderClient;
 class URL;
 class WorkerGlobalScope;
-class WorkerGlobalScopeProxy;
 class XMLHttpRequest;
 
 struct ReplayPosition;
@@ -225,11 +224,6 @@ public:
 
     static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
 
-    static bool shouldPauseDedicatedWorkerOnStart(ScriptExecutionContext*);
-    static void didStartWorkerGlobalScope(ScriptExecutionContext*, WorkerGlobalScopeProxy*, const URL&);
-    static void workerGlobalScopeTerminated(ScriptExecutionContext*, WorkerGlobalScopeProxy*);
-    static void willEvaluateWorkerScript(WorkerGlobalScope*, int workerThreadStartMode);
-
 #if ENABLE(WEB_REPLAY)
     static void sessionCreated(Page&, RefPtr<ReplaySession>&&);
     static void sessionLoaded(Page&, RefPtr<ReplaySession>&&);
@@ -399,10 +393,6 @@ private:
 
     static void didDispatchDOMStorageEventImpl(InstrumentingAgents&, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
 
-    static bool shouldPauseDedicatedWorkerOnStartImpl(InstrumentingAgents&);
-    static void didStartWorkerGlobalScopeImpl(InstrumentingAgents&, WorkerGlobalScopeProxy*, const URL&);
-    static void workerGlobalScopeTerminatedImpl(InstrumentingAgents&, WorkerGlobalScopeProxy*);
-
 #if ENABLE(WEB_REPLAY)
     static void sessionCreatedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
     static void sessionLoadedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
@@ -446,9 +436,6 @@ private:
     static InstrumentingAgents* instrumentingAgentsForDocument(Document*);
     static InstrumentingAgents* instrumentingAgentsForRenderer(RenderObject*);
 
-    static InstrumentingAgents* instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope*);
-    static InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ScriptExecutionContext*);
-
     static InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&);
 
     static void pauseOnNativeEventIfNeeded(InstrumentingAgents&, bool isDOMEvent, const String& eventName, bool synchronous);
@@ -1065,26 +1052,6 @@ inline void InspectorInstrumentation::didDispatchDOMStorageEvent(const String& k
         didDispatchDOMStorageEventImpl(*instrumentingAgents, key, oldValue, newValue, storageType, securityOrigin, page);
 }
 
-inline bool InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(ScriptExecutionContext* context)
-{
-    FAST_RETURN_IF_NO_FRONTENDS(false);
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
-        return shouldPauseDedicatedWorkerOnStartImpl(*instrumentingAgents);
-    return false;
-}
-
-inline void InspectorInstrumentation::didStartWorkerGlobalScope(ScriptExecutionContext* context, WorkerGlobalScopeProxy* proxy, const URL& url)
-{
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
-        didStartWorkerGlobalScopeImpl(*instrumentingAgents, proxy, url);
-}
-
-inline void InspectorInstrumentation::workerGlobalScopeTerminated(ScriptExecutionContext* context, WorkerGlobalScopeProxy* proxy)
-{
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
-        workerGlobalScopeTerminatedImpl(*instrumentingAgents, proxy);
-}
-
 #if ENABLE(WEB_SOCKETS)
 inline void InspectorInstrumentation::didCreateWebSocket(Document* document, unsigned long identifier, const URL& requestURL)
 {
@@ -1276,7 +1243,7 @@ inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForCont
         return nullptr;
     if (is<Document>(*context))
         return instrumentingAgentsForPage(downcast<Document>(context)->page());
-    return instrumentingAgentsForNonDocumentContext(context);
+    return nullptr;
 }
 
 inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForFrame(Frame* frame)
index ee895d3..d86ad13 100644 (file)
@@ -594,12 +594,11 @@ void InspectorTimelineAgent::didCompleteCurrentRecord(TimelineRecordType type)
     }
 }
 
-InspectorTimelineAgent::InspectorTimelineAgent(WebAgentContext& context, InspectorPageAgent* pageAgent, InspectorType type)
+InspectorTimelineAgent::InspectorTimelineAgent(WebAgentContext& context, InspectorPageAgent* pageAgent)
     : InspectorAgentBase(ASCIILiteral("Timeline"), context)
     , m_frontendDispatcher(std::make_unique<Inspector::TimelineFrontendDispatcher>(context.frontendRouter))
     , m_backendDispatcher(Inspector::TimelineBackendDispatcher::create(context.backendDispatcher, this))
     , m_pageAgent(pageAgent)
-    , m_inspectorType(type)
 {
 }
 
index f01e703..23a6f62 100644 (file)
@@ -92,9 +92,7 @@ class InspectorTimelineAgent final
     WTF_MAKE_NONCOPYABLE(InspectorTimelineAgent);
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    enum InspectorType { PageInspector, WorkerInspector };
-
-    InspectorTimelineAgent(WebAgentContext&, InspectorPageAgent*, InspectorType);
+    InspectorTimelineAgent(WebAgentContext&, InspectorPageAgent*);
     virtual ~InspectorTimelineAgent();
 
     virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
@@ -200,7 +198,6 @@ private:
     int m_id { 1 };
     int m_callStackDepth { 0 };
     int m_maxCallStackDepth { 5 };
-    InspectorType m_inspectorType;
 
     Vector<TimelineRecordEntry> m_pendingConsoleProfileRecords;
 
index 031e4c9..f682339 100644 (file)
@@ -34,7 +34,6 @@ namespace WebCore {
 
 class InstrumentingAgents;
 class Page;
-class WorkerGlobalScope;
 
 // FIXME: move this to Inspector namespace when remaining agents move.
 struct WebAgentContext : public Inspector::AgentContext {
@@ -57,16 +56,6 @@ struct PageAgentContext : public WebAgentContext {
     Page& inspectedPage;
 };
 
-struct WorkerAgentContext : public WebAgentContext {
-    WorkerAgentContext(WebAgentContext& context, WorkerGlobalScope& workerGlobalScope)
-        : WebAgentContext(context)
-        , workerGlobalScope(workerGlobalScope)
-    {
-    }
-
-    WorkerGlobalScope& workerGlobalScope;
-};
-
 class InspectorAgentBase : public Inspector::InspectorAgentBase {
 protected:
     InspectorAgentBase(const String& name, WebAgentContext& context)
diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/InspectorWorkerAgent.cpp
deleted file mode 100644 (file)
index eed4725..0000000
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InspectorWorkerAgent.h"
-
-#include "InstrumentingAgents.h"
-#include "URL.h"
-#include "WorkerGlobalScopeProxy.h"
-#include <inspector/InspectorFrontendDispatchers.h>
-#include <inspector/InspectorValues.h>
-#include <wtf/RefPtr.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-class InspectorWorkerAgent::WorkerFrontendChannel : public WorkerGlobalScopeProxy::PageInspector {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    explicit WorkerFrontendChannel(Inspector::WorkerFrontendDispatcher* frontendDispatcher, WorkerGlobalScopeProxy* proxy)
-        : m_frontendDispatcher(frontendDispatcher)
-        , m_proxy(proxy)
-        , m_id(s_nextId++)
-        , m_connected(false)
-    {
-    }
-    virtual ~WorkerFrontendChannel()
-    {
-        disconnectFromWorkerGlobalScope();
-    }
-
-    int id() const { return m_id; }
-    WorkerGlobalScopeProxy* proxy() const { return m_proxy; }
-
-    void connectToWorkerGlobalScope()
-    {
-        if (m_connected)
-            return;
-        m_connected = true;
-        m_proxy->connectToInspector(this);
-    }
-
-    void disconnectFromWorkerGlobalScope()
-    {
-        if (!m_connected)
-            return;
-        m_connected = false;
-        m_proxy->disconnectFromInspector();
-    }
-
-private:
-    // WorkerGlobalScopeProxy::PageInspector implementation
-    virtual void dispatchMessageFromWorker(const String& messageString) override
-    {
-        RefPtr<InspectorValue> parsedMessage;
-        if (!InspectorValue::parseJSON(messageString, parsedMessage))
-            return;
-
-        RefPtr<InspectorObject> messageObject;
-        if (!parsedMessage->asObject(messageObject))
-            return;
-
-        m_frontendDispatcher->dispatchMessageFromWorker(m_id, messageObject);
-    }
-
-    Inspector::WorkerFrontendDispatcher* m_frontendDispatcher;
-    WorkerGlobalScopeProxy* m_proxy;
-    int m_id;
-    bool m_connected;
-    static int s_nextId;
-};
-
-int InspectorWorkerAgent::WorkerFrontendChannel::s_nextId = 1;
-
-InspectorWorkerAgent::InspectorWorkerAgent(WebAgentContext& context)
-    : InspectorAgentBase(ASCIILiteral("Worker"), context)
-    , m_frontendDispatcher(std::make_unique<Inspector::WorkerFrontendDispatcher>(context.frontendRouter))
-    , m_backendDispatcher(Inspector::WorkerBackendDispatcher::create(context.backendDispatcher, this))
-{
-    m_instrumentingAgents.setInspectorWorkerAgent(this);
-}
-
-InspectorWorkerAgent::~InspectorWorkerAgent()
-{
-    m_instrumentingAgents.setInspectorWorkerAgent(nullptr);
-}
-
-void InspectorWorkerAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*)
-{
-}
-
-void InspectorWorkerAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
-{
-    m_shouldPauseDedicatedWorkerOnStart = false;
-    ErrorString unused;
-    disable(unused);
-}
-
-void InspectorWorkerAgent::enable(ErrorString&)
-{
-    m_enabled = true;
-
-    createWorkerFrontendChannelsForExistingWorkers();
-}
-
-void InspectorWorkerAgent::disable(ErrorString&)
-{
-    m_enabled = false;
-
-    destroyWorkerFrontendChannels();
-}
-
-void InspectorWorkerAgent::canInspectWorkers(ErrorString&, bool* result)
-{
-    *result = true;
-}
-
-void InspectorWorkerAgent::connectToWorker(ErrorString& error, int workerId)
-{
-    WorkerFrontendChannel* channel = m_idToChannel.get(workerId);
-    if (channel)
-        channel->connectToWorkerGlobalScope();
-    else
-        error = ASCIILiteral("Worker is gone");
-}
-
-void InspectorWorkerAgent::disconnectFromWorker(ErrorString& error, int workerId)
-{
-    WorkerFrontendChannel* channel = m_idToChannel.get(workerId);
-    if (channel)
-        channel->disconnectFromWorkerGlobalScope();
-    else
-        error = ASCIILiteral("Worker is gone");
-}
-
-void InspectorWorkerAgent::sendMessageToWorker(ErrorString& error, int workerId, const InspectorObject& message)
-{
-    WorkerFrontendChannel* channel = m_idToChannel.get(workerId);
-    if (channel)
-        channel->proxy()->sendMessageToInspector(message.toJSONString());
-    else
-        error = ASCIILiteral("Worker is gone");
-}
-
-void InspectorWorkerAgent::setAutoconnectToWorkers(ErrorString&, bool value)
-{
-    m_shouldPauseDedicatedWorkerOnStart = value;
-}
-
-bool InspectorWorkerAgent::shouldPauseDedicatedWorkerOnStart() const
-{
-    return m_shouldPauseDedicatedWorkerOnStart;
-}
-
-void InspectorWorkerAgent::didStartWorkerGlobalScope(WorkerGlobalScopeProxy* workerGlobalScopeProxy, const URL& url)
-{
-    m_dedicatedWorkers.set(workerGlobalScopeProxy, url.string());
-    if (m_enabled)
-        createWorkerFrontendChannel(workerGlobalScopeProxy, url.string());
-}
-
-void InspectorWorkerAgent::workerGlobalScopeTerminated(WorkerGlobalScopeProxy* proxy)
-{
-    m_dedicatedWorkers.remove(proxy);
-    for (WorkerChannels::iterator it = m_idToChannel.begin(); it != m_idToChannel.end(); ++it) {
-        if (proxy == it->value->proxy()) {
-            m_frontendDispatcher->workerTerminated(it->key);
-            delete it->value;
-            m_idToChannel.remove(it);
-            return;
-        }
-    }
-}
-
-void InspectorWorkerAgent::createWorkerFrontendChannelsForExistingWorkers()
-{
-    for (auto& worker : m_dedicatedWorkers)
-        createWorkerFrontendChannel(worker.key, worker.value);
-}
-
-void InspectorWorkerAgent::destroyWorkerFrontendChannels()
-{
-    for (auto& channel : m_idToChannel.values()) {
-        channel->disconnectFromWorkerGlobalScope();
-        delete channel;
-    }
-    m_idToChannel.clear();
-}
-
-void InspectorWorkerAgent::createWorkerFrontendChannel(WorkerGlobalScopeProxy* workerGlobalScopeProxy, const String& url)
-{
-    WorkerFrontendChannel* channel = new WorkerFrontendChannel(m_frontendDispatcher.get(), workerGlobalScopeProxy);
-    m_idToChannel.set(channel->id(), channel);
-
-    if (m_shouldPauseDedicatedWorkerOnStart)
-        channel->connectToWorkerGlobalScope();
-    m_frontendDispatcher->workerCreated(channel->id(), url, m_shouldPauseDedicatedWorkerOnStart);
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.h b/Source/WebCore/inspector/InspectorWorkerAgent.h
deleted file mode 100644 (file)
index d2f5ce7..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorWorkerAgent_h
-#define InspectorWorkerAgent_h
-
-#include "InspectorWebAgentBase.h"
-#include <inspector/InspectorBackendDispatchers.h>
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
-
-namespace Inspector {
-class InspectorObject;
-class WorkerFrontendDispatcher;
-}
-
-namespace WebCore {
-class URL;
-class WorkerGlobalScopeProxy;
-
-typedef String ErrorString;
-
-class InspectorWorkerAgent final : public InspectorAgentBase, public Inspector::WorkerBackendDispatcherHandler {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    explicit InspectorWorkerAgent(WebAgentContext&);
-    virtual ~InspectorWorkerAgent();
-
-    virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
-    virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
-
-    // Called from InspectorInstrumentation
-    bool shouldPauseDedicatedWorkerOnStart() const;
-    void didStartWorkerGlobalScope(WorkerGlobalScopeProxy*, const URL&);
-    void workerGlobalScopeTerminated(WorkerGlobalScopeProxy*);
-
-    // Called from InspectorBackendDispatcher
-    virtual void enable(ErrorString&) override;
-    virtual void disable(ErrorString&) override;
-    virtual void canInspectWorkers(ErrorString&, bool*) override;
-    virtual void connectToWorker(ErrorString&, int workerId) override;
-    virtual void disconnectFromWorker(ErrorString&, int workerId) override;
-    virtual void sendMessageToWorker(ErrorString&, int workerId, const Inspector::InspectorObject& message) override;
-    virtual void setAutoconnectToWorkers(ErrorString&, bool value) override;
-
-private:
-    void createWorkerFrontendChannelsForExistingWorkers();
-    void createWorkerFrontendChannel(WorkerGlobalScopeProxy*, const String& url);
-    void destroyWorkerFrontendChannels();
-
-    class WorkerFrontendChannel;
-
-    std::unique_ptr<Inspector::WorkerFrontendDispatcher> m_frontendDispatcher;
-    RefPtr<Inspector::WorkerBackendDispatcher> m_backendDispatcher;
-
-    bool m_enabled { false };
-    bool m_shouldPauseDedicatedWorkerOnStart { false };
-    
-    typedef HashMap<int, WorkerFrontendChannel*> WorkerChannels;
-    WorkerChannels m_idToChannel;
-    typedef HashMap<WorkerGlobalScopeProxy*, String> DedicatedWorkers;
-    DedicatedWorkers m_dedicatedWorkers;
-};
-
-} // namespace WebCore
-
-#endif // !defined(InspectorWorkerAgent_h)
diff --git a/Source/WebCore/inspector/InspectorWorkerResource.h b/Source/WebCore/inspector/InspectorWorkerResource.h
deleted file mode 100644 (file)
index aeaa0d0..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorWorkerResource_h
-#define InspectorWorkerResource_h
-
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class InspectorWorkerResource : public RefCounted<InspectorWorkerResource> {
-public:
-    static Ref<InspectorWorkerResource> create(intptr_t id, const String& url, bool isSharedWorker)
-    {
-        return adoptRef(*new InspectorWorkerResource(id, url, isSharedWorker));
-    }
-
-    intptr_t id() const { return m_id; }
-    const String& url() const { return m_url; }
-    bool isSharedWorker() const { return m_isSharedWorker; }
-private:
-    InspectorWorkerResource(intptr_t id, const String& url, bool isSharedWorker)
-        : m_id(id)
-        , m_url(url)
-        , m_isSharedWorker(isSharedWorker)
-    {
-    }
-
-    intptr_t m_id;
-    String m_url;
-    bool m_isSharedWorker;
-};
-
-} // namespace WebCore
-
-#endif // InspectorWorkerResource_h
index 14dab71..73dfc91 100644 (file)
 #include "config.h"
 #include "InstrumentingAgents.h"
 
-#include "InspectorController.h"
-#include "Page.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerInspectorController.h"
-#include <wtf/MainThread.h>
-
 using namespace Inspector;
 
 namespace WebCore {
@@ -57,7 +51,6 @@ void InstrumentingAgents::reset()
     m_inspectorDOMAgent = nullptr;
     m_inspectorNetworkAgent = nullptr;
     m_pageRuntimeAgent = nullptr;
-    m_workerRuntimeAgent = nullptr;
     m_inspectorTimelineAgent = nullptr;
     m_persistentInspectorTimelineAgent = nullptr;
     m_inspectorDOMStorageAgent = nullptr;
@@ -69,7 +62,6 @@ void InstrumentingAgents::reset()
     m_inspectorDebuggerAgent = nullptr;
     m_pageDebuggerAgent = nullptr;
     m_inspectorDOMDebuggerAgent = nullptr;
-    m_inspectorWorkerAgent = nullptr;
 }
 
 } // namespace WebCore
index 40d4f12..c3dacf1 100644 (file)
@@ -55,13 +55,10 @@ class InspectorNetworkAgent;
 class InspectorPageAgent;
 class InspectorReplayAgent;
 class InspectorTimelineAgent;
-class InspectorWorkerAgent;
 class Page;
 class PageDebuggerAgent;
 class PageRuntimeAgent;
 class WebConsoleAgent;
-class WorkerGlobalScope;
-class WorkerRuntimeAgent;
 
 class InstrumentingAgents : public RefCounted<InstrumentingAgents> {
     WTF_MAKE_NONCOPYABLE(InstrumentingAgents);
@@ -99,9 +96,6 @@ public:
     PageRuntimeAgent* pageRuntimeAgent() const { return m_pageRuntimeAgent; }
     void setPageRuntimeAgent(PageRuntimeAgent* agent) { m_pageRuntimeAgent = agent; }
 
-    WorkerRuntimeAgent* workerRuntimeAgent() const { return m_workerRuntimeAgent; }
-    void setWorkerRuntimeAgent(WorkerRuntimeAgent* agent) { m_workerRuntimeAgent = agent; }
-
     InspectorTimelineAgent* inspectorTimelineAgent() const { return m_inspectorTimelineAgent; }
     void setInspectorTimelineAgent(InspectorTimelineAgent* agent) { m_inspectorTimelineAgent = agent; }
 
@@ -131,9 +125,6 @@ public:
     InspectorDOMDebuggerAgent* inspectorDOMDebuggerAgent() const { return m_inspectorDOMDebuggerAgent; }
     void setInspectorDOMDebuggerAgent(InspectorDOMDebuggerAgent* agent) { m_inspectorDOMDebuggerAgent = agent; }
 
-    InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
-    void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
-
     InspectorLayerTreeAgent* inspectorLayerTreeAgent() const { return m_inspectorLayerTreeAgent; }
     void setInspectorLayerTreeAgent(InspectorLayerTreeAgent* agent) { m_inspectorLayerTreeAgent = agent; }
 
@@ -150,7 +141,6 @@ private:
     InspectorDOMAgent* m_inspectorDOMAgent { nullptr };
     InspectorNetworkAgent* m_inspectorNetworkAgent { nullptr };
     PageRuntimeAgent* m_pageRuntimeAgent { nullptr };
-    WorkerRuntimeAgent* m_workerRuntimeAgent { nullptr };
     InspectorTimelineAgent* m_inspectorTimelineAgent { nullptr };
     InspectorTimelineAgent* m_persistentInspectorTimelineAgent { nullptr };
     InspectorDOMStorageAgent* m_inspectorDOMStorageAgent { nullptr };
@@ -162,7 +152,6 @@ private:
     Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent { nullptr };
     PageDebuggerAgent* m_pageDebuggerAgent { nullptr };
     InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent { nullptr };
-    InspectorWorkerAgent* m_inspectorWorkerAgent { nullptr };
 };
 
 } // namespace WebCore
index 4c758f0..8ab1ccb 100644 (file)
@@ -47,7 +47,6 @@ public:
     virtual ~PageConsoleAgent() { }
 
 private:
-    virtual bool isWorkerAgent() const override { return false; }
     virtual void clearMessages(ErrorString&) override;
     virtual void addInspectedNode(ErrorString&, int nodeId) override;
 
index e7c5f93..cb64a07 100644 (file)
@@ -52,7 +52,7 @@ using namespace Inspector;
 namespace WebCore {
 
 PageScriptDebugServer::PageScriptDebugServer(Page& page)
-    : ScriptDebugServer(WebCore::JSDOMWindowBase::commonVM(), false)
+    : ScriptDebugServer(WebCore::JSDOMWindowBase::commonVM())
     , m_page(page)
 {
 }
diff --git a/Source/WebCore/inspector/WorkerConsoleAgent.cpp b/Source/WebCore/inspector/WorkerConsoleAgent.cpp
deleted file mode 100644 (file)
index 2719486..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkerConsoleAgent.h"
-
-using namespace Inspector;
-
-namespace WebCore {
-
-WorkerConsoleAgent::WorkerConsoleAgent(WorkerAgentContext& context)
-    : WebConsoleAgent(context)
-{
-}
-
-void WorkerConsoleAgent::addInspectedNode(ErrorString& error, int)
-{
-    error = ASCIILiteral("addInspectedNode is not supported for workers");
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/inspector/WorkerConsoleAgent.h b/Source/WebCore/inspector/WorkerConsoleAgent.h
deleted file mode 100644 (file)
index b24e830..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WorkerConsoleAgent_h
-#define WorkerConsoleAgent_h
-
-#include "InspectorWebAgentBase.h"
-#include "WebConsoleAgent.h"
-
-namespace WebCore {
-
-class WorkerConsoleAgent final : public WebConsoleAgent {
-    WTF_MAKE_NONCOPYABLE(WorkerConsoleAgent);
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    WorkerConsoleAgent(WorkerAgentContext&);
-    virtual ~WorkerConsoleAgent() { }
-
-    virtual bool isWorkerAgent() const override { return true; }
-
-private:
-    virtual void addInspectedNode(ErrorString&, int nodeId) override;
-};
-
-} // namespace WebCore
-
-#endif // !defined(WorkerConsoleAgent_h)
diff --git a/Source/WebCore/inspector/WorkerDebuggerAgent.cpp b/Source/WebCore/inspector/WorkerDebuggerAgent.cpp
deleted file mode 100644 (file)
index 31b30ff..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkerDebuggerAgent.h"
-
-#include "WorkerGlobalScope.h"
-#include "WorkerScriptDebugServer.h"
-#include "WorkerThread.h"
-#include <inspector/InjectedScript.h>
-#include <inspector/InjectedScriptManager.h>
-#include <inspector/ScriptDebugServer.h>
-#include <wtf/Lock.h>
-#include <wtf/MessageQueue.h>
-#include <wtf/NeverDestroyed.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-namespace {
-
-StaticLock workerDebuggerAgentsMutex;
-
-typedef HashMap<WorkerThread*, WorkerDebuggerAgent*> WorkerDebuggerAgents;
-
-WorkerDebuggerAgents& workerDebuggerAgents()
-{
-    static NeverDestroyed<WorkerDebuggerAgents> agents;
-
-    return agents;
-}
-
-class RunInspectorCommandsTask : public WorkerScriptDebugServer::Task {
-public:
-    RunInspectorCommandsTask(WorkerThread* thread, WorkerGlobalScope* workerGlobalScope)
-        : m_thread(thread)
-        , m_workerGlobalScope(workerGlobalScope) { }
-    virtual ~RunInspectorCommandsTask() { }
-    virtual void run() override
-    {
-        // Process all queued debugger commands. It is safe to use m_workerGlobalScope here
-        // because it is alive if RunWorkerLoop is not terminated, otherwise it will
-        // just be ignored. WorkerThread is certainly alive if this task is being executed.
-        while (MessageQueueMessageReceived == m_thread->runLoop().runInMode(m_workerGlobalScope, WorkerDebuggerAgent::debuggerTaskMode, WorkerRunLoop::DontWaitForMessage)) { }
-    }
-
-private:
-    WorkerThread* m_thread;
-    WorkerGlobalScope* m_workerGlobalScope;
-};
-
-} // namespace
-
-const char* WorkerDebuggerAgent::debuggerTaskMode = "debugger";
-
-WorkerDebuggerAgent::WorkerDebuggerAgent(WorkerAgentContext& context)
-    : WebDebuggerAgent(context)
-    , m_inspectedWorkerGlobalScope(context.workerGlobalScope)
-{
-    std::lock_guard<StaticLock> lock(workerDebuggerAgentsMutex);
-    workerDebuggerAgents().set(&context.workerGlobalScope.thread(), this);
-}
-
-WorkerDebuggerAgent::~WorkerDebuggerAgent()
-{
-    std::lock_guard<StaticLock> lock(workerDebuggerAgentsMutex);
-
-    ASSERT(workerDebuggerAgents().contains(&m_inspectedWorkerGlobalScope.thread()));
-    workerDebuggerAgents().remove(&m_inspectedWorkerGlobalScope.thread());
-}
-
-void WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(WorkerThread* thread)
-{
-    std::lock_guard<StaticLock> lock(workerDebuggerAgentsMutex);
-
-    if (WorkerDebuggerAgent* agent = workerDebuggerAgents().get(thread)) {
-        WorkerScriptDebugServer& workerScriptDebugServer = static_cast<WorkerScriptDebugServer&>(agent->scriptDebugServer());
-        workerScriptDebugServer.interruptAndRunTask(std::make_unique<RunInspectorCommandsTask>(thread, &agent->m_inspectedWorkerGlobalScope));
-    }
-}
-
-void WorkerDebuggerAgent::breakpointActionLog(JSC::ExecState*, const String& message)
-{
-    m_inspectedWorkerGlobalScope.addConsoleMessage(MessageSource::JS, MessageLevel::Log, message);
-}
-
-InjectedScript WorkerDebuggerAgent::injectedScriptForEval(ErrorString& error, const int* executionContextId)
-{
-    if (executionContextId) {
-        error = ASCIILiteral("Execution context id is not supported for workers as there is only one execution context.");
-        return InjectedScript();
-    }
-
-    JSC::ExecState* scriptState = execStateFromWorkerGlobalScope(&m_inspectedWorkerGlobalScope);
-    return injectedScriptManager().injectedScriptFor(scriptState);
-}
-
-void WorkerDebuggerAgent::muteConsole()
-{
-    // We don't need to mute console for workers.
-}
-
-void WorkerDebuggerAgent::unmuteConsole()
-{
-    // We don't need to mute console for workers.
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/inspector/WorkerDebuggerAgent.h b/Source/WebCore/inspector/WorkerDebuggerAgent.h
deleted file mode 100644 (file)
index 55666ef..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WorkerDebuggerAgent_h
-#define WorkerDebuggerAgent_h
-
-#include "WebDebuggerAgent.h"
-
-namespace WebCore {
-
-class WorkerGlobalScope;
-class WorkerThread;
-
-class WorkerDebuggerAgent final : public WebDebuggerAgent {
-    WTF_MAKE_NONCOPYABLE(WorkerDebuggerAgent);
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    WorkerDebuggerAgent(WorkerAgentContext&);
-    virtual ~WorkerDebuggerAgent();
-
-    static const char* debuggerTaskMode;
-    static void interruptAndDispatchInspectorCommands(WorkerThread*);
-
-    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
-    virtual void muteConsole() override;
-    virtual void unmuteConsole() override;
-
-    virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
-
-private:
-    WorkerGlobalScope& m_inspectedWorkerGlobalScope;
-};
-
-} // namespace WebCore
-
-#endif // !defined(WorkerDebuggerAgent_h)
diff --git a/Source/WebCore/inspector/WorkerInspectorController.cpp b/Source/WebCore/inspector/WorkerInspectorController.cpp
deleted file mode 100644 (file)
index 27a8a26..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkerInspectorController.h"
-
-#include "CommandLineAPIHost.h"
-#include "InspectorInstrumentation.h"
-#include "InspectorTimelineAgent.h"
-#include "InstrumentingAgents.h"
-#include "JSDOMWindowBase.h"
-#include "JSMainThreadExecState.h"
-#include "WebInjectedScriptHost.h"
-#include "WebInjectedScriptManager.h"
-#include "WorkerConsoleAgent.h"
-#include "WorkerDebuggerAgent.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerReportingProxy.h"
-#include "WorkerRuntimeAgent.h"
-#include "WorkerThread.h"
-#include <inspector/InspectorBackendDispatcher.h>
-#include <inspector/InspectorFrontendChannel.h>
-#include <inspector/InspectorFrontendDispatchers.h>
-#include <inspector/InspectorFrontendRouter.h>
-#include <wtf/Stopwatch.h>
-
-using namespace JSC;
-using namespace Inspector;
-
-namespace WebCore {
-
-namespace {
-
-class PageInspectorProxy : public FrontendChannel {
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    explicit PageInspectorProxy(WorkerGlobalScope& workerGlobalScope)
-        : m_workerGlobalScope(workerGlobalScope) { }
-    virtual ~PageInspectorProxy() { }
-
-    virtual ConnectionType connectionType() const override { return ConnectionType::Local; }
-private:
-    virtual bool sendMessageToFrontend(const String& message) override
-    {
-        m_workerGlobalScope.thread().workerReportingProxy().postMessageToPageInspector(message);
-        return true;
-    }
-    WorkerGlobalScope& m_workerGlobalScope;
-};
-
-}
-
-WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope& workerGlobalScope)
-    : m_workerGlobalScope(workerGlobalScope)
-    , m_instrumentingAgents(InstrumentingAgents::create(*this))
-    , m_injectedScriptManager(std::make_unique<WebInjectedScriptManager>(*this, WebInjectedScriptHost::create()))
-    , m_executionStopwatch(Stopwatch::create())
-    , m_scriptDebugServer(workerGlobalScope, WorkerDebuggerAgent::debuggerTaskMode)
-    , m_frontendRouter(FrontendRouter::create())
-    , m_backendDispatcher(BackendDispatcher::create(m_frontendRouter.copyRef()))
-{
-    AgentContext baseContext = {
-        *this,
-        *m_injectedScriptManager,
-        m_frontendRouter.get(),
-        m_backendDispatcher.get()
-    };
-
-    WebAgentContext webContext = {
-        baseContext,
-        m_instrumentingAgents.get()
-    };
-
-    WorkerAgentContext workerContext = {
-        webContext,
-        workerGlobalScope,
-    };
-
-    auto runtimeAgent = std::make_unique<WorkerRuntimeAgent>(workerContext);
-    m_runtimeAgent = runtimeAgent.get();
-    m_instrumentingAgents->setWorkerRuntimeAgent(m_runtimeAgent);
-    m_agents.append(WTF::move(runtimeAgent));
-
-    auto consoleAgent = std::make_unique<WorkerConsoleAgent>(workerContext);
-    m_instrumentingAgents->setWebConsoleAgent(consoleAgent.get());
-
-    auto debuggerAgent = std::make_unique<WorkerDebuggerAgent>(workerContext);
-    m_agents.append(WTF::move(debuggerAgent));
-
-    m_agents.append(std::make_unique<InspectorTimelineAgent>(workerContext, nullptr, InspectorTimelineAgent::WorkerInspector));
-    m_agents.append(WTF::move(consoleAgent));
-
-    if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost()) {
-        commandLineAPIHost->init(nullptr
-            , nullptr
-            , nullptr
-            , nullptr
-            , nullptr
-        );
-    }
-}
-WorkerInspectorController::~WorkerInspectorController()
-{
-    ASSERT(!m_frontendRouter->hasFrontends());
-    ASSERT(!m_forwardingChannel);
-
-    m_instrumentingAgents->reset();
-}
-
-void WorkerInspectorController::connectFrontend()
-{
-    ASSERT(!m_frontendRouter->hasFrontends());
-    ASSERT(!m_forwardingChannel);
-
-    m_forwardingChannel = std::make_unique<PageInspectorProxy>(m_workerGlobalScope);
-    m_frontendRouter->connectFrontend(m_forwardingChannel.get());
-    m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
-}
-
-void WorkerInspectorController::disconnectFrontend(Inspector::DisconnectReason reason)
-{
-    ASSERT(m_frontendRouter->hasFrontends());
-    ASSERT(m_forwardingChannel);
-
-    m_agents.willDestroyFrontendAndBackend(reason);
-    m_frontendRouter->disconnectFrontend(m_forwardingChannel.get());
-    m_forwardingChannel = nullptr;
-}
-
-void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)
-{
-    m_backendDispatcher->dispatch(message);
-}
-
-void WorkerInspectorController::resume()
-{
-    ErrorString unused;
-    m_runtimeAgent->run(unused);
-}
-
-InspectorFunctionCallHandler WorkerInspectorController::functionCallHandler() const
-{
-    return WebCore::functionCallHandlerFromAnyThread;
-}
-
-InspectorEvaluateHandler WorkerInspectorController::evaluateHandler() const
-{
-    return WebCore::evaluateHandlerFromAnyThread;
-}
-
-void WorkerInspectorController::willCallInjectedScriptFunction(JSC::ExecState* scriptState, const String& scriptName, int scriptLine)
-{
-    ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromExecState(scriptState);
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(scriptExecutionContext, scriptName, scriptLine);
-    m_injectedScriptInstrumentationCookies.append(cookie);
-}
-
-void WorkerInspectorController::didCallInjectedScriptFunction(JSC::ExecState* scriptState)
-{
-    ASSERT(!m_injectedScriptInstrumentationCookies.isEmpty());
-    ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromExecState(scriptState);
-    InspectorInstrumentationCookie cookie = m_injectedScriptInstrumentationCookies.takeLast();
-    InspectorInstrumentation::didCallFunction(cookie, scriptExecutionContext);
-}
-
-Ref<Stopwatch> WorkerInspectorController::executionStopwatch()
-{
-    return m_executionStopwatch.copyRef();
-}
-
-WorkerScriptDebugServer& WorkerInspectorController::scriptDebugServer()
-{
-    return m_scriptDebugServer;
-}
-
-VM& WorkerInspectorController::vm()
-{
-    return m_workerGlobalScope.vm();
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/inspector/WorkerInspectorController.h b/Source/WebCore/inspector/WorkerInspectorController.h
deleted file mode 100644 (file)
index 2f51b42..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WorkerInspectorController_h
-#define WorkerInspectorController_h
-
-#include "InspectorInstrumentationCookie.h"
-#include "InspectorWebAgentBase.h"
-#include "WorkerScriptDebugServer.h"
-#include <inspector/InspectorAgentRegistry.h>
-#include <inspector/InspectorEnvironment.h>
-#include <wtf/Forward.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/Vector.h>
-
-namespace Inspector {
-class FrontendChannel;
-class FrontendRouter;
-};
-
-namespace WebCore {
-
-class InspectorInstrumentation;
-class InstrumentingAgents;
-class WebInjectedScriptManager;
-class WorkerGlobalScope;
-class WorkerRuntimeAgent;
-
-class WorkerInspectorController final : public Inspector::InspectorEnvironment {
-    WTF_MAKE_NONCOPYABLE(WorkerInspectorController);
-    WTF_MAKE_FAST_ALLOCATED;
-public:
-    explicit WorkerInspectorController(WorkerGlobalScope&);
-    virtual ~WorkerInspectorController();
-
-    void connectFrontend();
-    void disconnectFrontend(Inspector::DisconnectReason);
-    void dispatchMessageFromFrontend(const String&);
-    void resume();
-
-    virtual bool developerExtrasEnabled() const override { return true; }
-    virtual bool canAccessInspectedScriptState(JSC::ExecState*) const override { return true; }
-    virtual Inspector::InspectorFunctionCallHandler functionCallHandler() const override;
-    virtual Inspector::InspectorEvaluateHandler evaluateHandler() const override;
-    virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) override;
-    virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
-    virtual void frontendInitialized() override { }
-    virtual Ref<WTF::Stopwatch> executionStopwatch() override;
-    virtual WorkerScriptDebugServer& scriptDebugServer() override;
-    virtual JSC::VM& vm() override;
-
-private:
-    friend class InspectorInstrumentation;
-
-    WorkerGlobalScope& m_workerGlobalScope;
-    Ref<InstrumentingAgents> m_instrumentingAgents;
-    std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;
-    WorkerRuntimeAgent* m_runtimeAgent { nullptr };
-    Inspector::AgentRegistry m_agents;
-    std::unique_ptr<Inspector::FrontendChannel> m_forwardingChannel;
-    Ref<WTF::Stopwatch> m_executionStopwatch;
-    WorkerScriptDebugServer m_scriptDebugServer;
-    Ref<Inspector::FrontendRouter> m_frontendRouter;
-    Ref<Inspector::BackendDispatcher> m_backendDispatcher;
-    Vector<InspectorInstrumentationCookie, 2> m_injectedScriptInstrumentationCookies;
-};
-
-}
-
-#endif // !defined(WorkerInspectorController_h)
diff --git a/Source/WebCore/inspector/WorkerRuntimeAgent.cpp b/Source/WebCore/inspector/WorkerRuntimeAgent.cpp
deleted file mode 100644 (file)
index 52879c5..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WorkerRuntimeAgent.h"
-
-#include "DOMWindow.h"
-#include "InstrumentingAgents.h"
-#include "JSDOMWindowBase.h"
-#include "ScriptState.h"
-#include "WorkerDebuggerAgent.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerRunLoop.h"
-#include "WorkerThread.h"
-#include <inspector/InjectedScript.h>
-#include <inspector/InjectedScriptManager.h>
-
-using namespace Inspector;
-
-namespace WebCore {
-
-WorkerRuntimeAgent::WorkerRuntimeAgent(WorkerAgentContext& context)
-    : InspectorRuntimeAgent(context)
-    , m_backendDispatcher(Inspector::RuntimeBackendDispatcher::create(context.backendDispatcher, this))
-    , m_workerGlobalScope(context.workerGlobalScope)
-{
-}
-
-void WorkerRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*)
-{
-}
-
-void WorkerRuntimeAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason reason)
-{
-    InspectorRuntimeAgent::willDestroyFrontendAndBackend(reason);
-}
-
-InjectedScript WorkerRuntimeAgent::injectedScriptForEval(ErrorString& error, const int* executionContextId)
-{
-    if (executionContextId) {
-        error = ASCIILiteral("Execution context id is not supported for workers as there is only one execution context.");
-        return InjectedScript();
-    }
-
-    JSC::ExecState* scriptState = execStateFromWorkerGlobalScope(&m_workerGlobalScope);
-    return injectedScriptManager().injectedScriptFor(scriptState);
-}
-
-void WorkerRuntimeAgent::muteConsole()
-{
-    // We don't need to mute console for workers.
-}
-
-void WorkerRuntimeAgent::unmuteConsole()
-{
-    // We don't need to mute console for workers.
-}
-
-void WorkerRuntimeAgent::run(ErrorString&)
-{
-    m_paused = false;
-}
-
-void WorkerRuntimeAgent::pauseWorkerGlobalScope(WorkerGlobalScope* context)
-{
-    m_paused = true;
-    MessageQueueWaitResult result;
-    do {
-        result = context->thread().runLoop().runInMode(context, WorkerDebuggerAgent::debuggerTaskMode);
-    // Keep waiting until execution is resumed.
-    } while (result == MessageQueueMessageReceived && m_paused);
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/inspector/WorkerRuntimeAgent.h b/Source/WebCore/inspector/WorkerRuntimeAgent.h
deleted file mode 100644 (file)
index 2c4de92..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WorkerRuntimeAgent_h
-#define WorkerRuntimeAgent_h
-
-#include "InspectorWebAgentBase.h"
-#include <inspector/agents/InspectorRuntimeAgent.h>
-
-namespace WebCore {
-
-class WorkerGlobalScope;
-typedef String ErrorString;
-
-class WorkerRuntimeAgent final : public Inspector::InspectorRuntimeAgent {
-public:
-    WorkerRuntimeAgent(WorkerAgentContext&);
-    virtual ~WorkerRuntimeAgent() { }
-
-    virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
-    virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
-
-    virtual void run(ErrorString&) override;
-
-    void pauseWorkerGlobalScope(WorkerGlobalScope*);
-
-private:
-    virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
-    virtual void muteConsole() override;
-    virtual void unmuteConsole() override;
-
-    RefPtr<Inspector::RuntimeBackendDispatcher> m_backendDispatcher;
-    WorkerGlobalScope& m_workerGlobalScope;
-
-    bool m_paused { false };
-};
-
-} // namespace WebCore
-
-#endif // !defined(InspectorPagerAgent_h)
index de3d4e1..ce12b77 100644 (file)
@@ -161,8 +161,6 @@ void Worker::notifyFinished()
         dispatchEvent(Event::create(eventNames().errorEvent, false, true));
     else {
         WorkerThreadStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
-        if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(scriptExecutionContext()))
-            startMode = PauseWorkerGlobalScopeOnStart;
         m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), scriptExecutionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), startMode);
         InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());
     }
index 908d1e3..42f2108 100644 (file)
@@ -43,7 +43,6 @@
 #include "SecurityOrigin.h"
 #include "SecurityOriginPolicy.h"
 #include "URL.h"
-#include "WorkerInspectorController.h"
 #include "WorkerLocation.h"
 #include "WorkerNavigator.h"
 #include "WorkerObjectProxy.h"
@@ -69,7 +68,6 @@ WorkerGlobalScope::WorkerGlobalScope(const URL& url, const String& userAgent, Wo
     , m_userAgent(userAgent)
     , m_script(std::make_unique<WorkerScriptController>(this))
     , m_thread(thread)
-    , m_workerInspectorController(std::make_unique<WorkerInspectorController>(*this))
     , m_closing(false)
     , m_eventQueue(*this)
     , m_topOrigin(topOrigin)
index 5fa5e87..2acefce 100644 (file)
@@ -46,7 +46,6 @@ namespace WebCore {
 
     class Blob;
     class ScheduledAction;
-    class WorkerInspectorController;
     class WorkerLocation;
     class WorkerNavigator;
     class WorkerThread;
@@ -95,8 +94,6 @@ namespace WebCore {
         virtual bool isContextThread() const override;
         virtual bool isJSExecutionForbidden() const override;
 
-        WorkerInspectorController& workerInspectorController() { return *m_workerInspectorController; }
-
         // These methods are used for GC marking. See JSWorkerGlobalScope::visitChildrenVirtual(SlotVisitor&) in
         // JSWorkerGlobalScopeCustom.cpp.
         WorkerNavigator* optionalNavigator() const { return m_navigator.get(); }
@@ -161,7 +158,6 @@ namespace WebCore {
         std::unique_ptr<WorkerScriptController> m_script;
         WorkerThread& m_thread;
 
-        const std::unique_ptr<WorkerInspectorController> m_workerInspectorController;
         bool m_closing;
 
         HashSet<Observer*> m_workerObservers;
index 79f67a4..f5fbf4f 100644 (file)
@@ -59,15 +59,6 @@ namespace WebCore {
         virtual void workerObjectDestroyed() = 0;
 
         virtual void notifyNetworkStateChange(bool isOnline) = 0;
-
-        class PageInspector {
-        public:
-            virtual ~PageInspector() { }
-            virtual void dispatchMessageFromWorker(const String&) = 0;
-        };
-        virtual void connectToInspector(PageInspector*) { }
-        virtual void disconnectFromInspector() { }
-        virtual void sendMessageToInspector(const String&) { }
     };
 
 } // namespace WebCore
index bd74eac..f6cf130 100644 (file)
 #include "Event.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
-#include "InspectorInstrumentation.h"
 #include "MessageEvent.h"
 #include "PageGroup.h"
 #include "ScriptExecutionContext.h"
 #include "Worker.h"
-#include "WorkerDebuggerAgent.h"
-#include "WorkerInspectorController.h"
-#include <inspector/InspectorAgentBase.h>
 #include <inspector/ScriptCallStack.h>
 #include <runtime/ConsoleTypes.h>
 #include <wtf/MainThread.h>
@@ -63,7 +59,6 @@ WorkerMessagingProxy::WorkerMessagingProxy(Worker* workerObject)
     , m_unconfirmedMessageCount(0)
     , m_workerThreadHadPendingActivity(false)
     , m_askedToTerminate(false)
-    , m_pageInspector(nullptr)
 {
     ASSERT(m_workerObject);
     ASSERT((is<Document>(*m_scriptExecutionContext) && isMainThread())
@@ -85,7 +80,6 @@ void WorkerMessagingProxy::startWorkerGlobalScope(const URL& scriptURL, const St
     RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, sourceCode, *this, *this, startMode, document.contentSecurityPolicy()->deprecatedHeader(), document.contentSecurityPolicy()->deprecatedHeaderType(), document.topOrigin());
     workerThreadCreated(thread);
     thread->start();
-    InspectorInstrumentation::didStartWorkerGlobalScope(m_scriptExecutionContext.get(), this, scriptURL);
 }
 
 void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
@@ -211,38 +205,6 @@ void WorkerMessagingProxy::notifyNetworkStateChange(bool isOnline)
     });
 }
 
-void WorkerMessagingProxy::connectToInspector(WorkerGlobalScopeProxy::PageInspector* pageInspector)
-{
-    if (m_askedToTerminate)
-        return;
-    ASSERT(!m_pageInspector);
-    m_pageInspector = pageInspector;
-    m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
-        downcast<WorkerGlobalScope>(context).workerInspectorController().connectFrontend();
-    }, WorkerDebuggerAgent::debuggerTaskMode);
-}
-
-void WorkerMessagingProxy::disconnectFromInspector()
-{
-    m_pageInspector = nullptr;
-    if (m_askedToTerminate)
-        return;
-    m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
-        downcast<WorkerGlobalScope>(context).workerInspectorController().disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
-    }, WorkerDebuggerAgent::debuggerTaskMode);
-}
-
-void WorkerMessagingProxy::sendMessageToInspector(const String& message)
-{
-    if (m_askedToTerminate)
-        return;
-    StringCapture capturedMessage(message);
-    m_workerThread->runLoop().postTaskForMode([capturedMessage] (ScriptExecutionContext& context) {
-        downcast<WorkerGlobalScope>(context).workerInspectorController().dispatchMessageFromFrontend(capturedMessage.string());
-    }, WorkerDebuggerAgent::debuggerTaskMode);
-    WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.get());
-}
-
 void WorkerMessagingProxy::workerGlobalScopeDestroyed()
 {
     m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
@@ -266,8 +228,6 @@ void WorkerMessagingProxy::workerGlobalScopeDestroyedInternal()
     m_askedToTerminate = true;
     m_workerThread = nullptr;
 
-    InspectorInstrumentation::workerGlobalScopeTerminated(m_scriptExecutionContext.get(), this);
-
     if (m_mayBeDestroyed)
         delete this;
 }
@@ -280,17 +240,6 @@ void WorkerMessagingProxy::terminateWorkerGlobalScope()
 
     if (m_workerThread)
         m_workerThread->stop();
-
-    InspectorInstrumentation::workerGlobalScopeTerminated(m_scriptExecutionContext.get(), this);
-}
-
-void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
-{
-    StringCapture capturedMessage(message);
-    m_scriptExecutionContext->postTask([this, capturedMessage] (ScriptExecutionContext&) {
-        if (m_pageInspector)
-            m_pageInspector->dispatchMessageFromWorker(capturedMessage.string());
-    });
 }
 
 void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
index 95941c6..eb7af58 100644 (file)
@@ -58,16 +58,11 @@ namespace WebCore {
         virtual void workerObjectDestroyed() override;
         virtual void notifyNetworkStateChange(bool isOnline) override;
 
-        virtual void connectToInspector(WorkerGlobalScopeProxy::PageInspector*) override;
-        virtual void disconnectFromInspector() override;
-        virtual void sendMessageToInspector(const String&) override;
-
         // Implementations of WorkerObjectProxy.
         // (Only use these methods in the worker context thread.)
         virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
         virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) override;
         virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) override;
-        virtual void postMessageToPageInspector(const String&) override;
         virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) override;
         virtual void reportPendingActivity(bool hasPendingActivity) override;
         virtual void workerGlobalScopeClosed() override;
@@ -89,7 +84,6 @@ namespace WebCore {
 
     private:
         friend class MessageWorkerTask;
-        friend class PostMessageToPageInspectorTask;
         friend class WorkerGlobalScopeDestroyedTask;
         friend class WorkerExceptionTask;
         friend class WorkerThreadActivityReportTask;
@@ -109,7 +103,6 @@ namespace WebCore {
         bool m_askedToTerminate;
 
         Vector<std::unique_ptr<ScriptExecutionContext::Task>> m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
-        WorkerGlobalScopeProxy::PageInspector* m_pageInspector;
     };
 
 } // namespace WebCore
index df35e51..adcbb9d 100644 (file)
@@ -45,8 +45,6 @@ namespace WebCore {
 
         virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) = 0;
 
-        virtual void postMessageToPageInspector(const String&) = 0;
-
         // Invoked when close() is invoked on the worker context.
         virtual void workerGlobalScopeClosed() = 0;
 
index 87b509f..0a61c37 100644 (file)
@@ -29,7 +29,6 @@
 #include "WorkerThread.h"
 
 #include "DedicatedWorkerGlobalScope.h"
-#include "InspectorInstrumentation.h"
 #include "ScriptSourceCode.h"
 #include "SecurityOrigin.h"
 #include "ThreadGlobalData.h"
@@ -147,7 +146,6 @@ void WorkerThread::workerThread()
     }
 
     WorkerScriptController* script = m_workerGlobalScope->script();
-    InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), m_startupData->m_startMode);
     script->evaluate(ScriptSourceCode(m_startupData->m_sourceCode, m_startupData->m_scriptURL));
     // Free the startup data to cause its member variable deref's happen on the worker's thread (since
     // all ref/derefs of these objects are happening on the thread at this point). Note that
index b901221..aa77e24 100644 (file)
@@ -1,5 +1,21 @@
 2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Remove untested and unused Worker inspection
+        https://bugs.webkit.org/show_bug.cgi?id=151848
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js:
+        * UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js:
+        * UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js:
+        * Versions/Inspector-iOS-7.0.json:
+        * Versions/Inspector-iOS-8.0.json:
+        * Versions/Inspector-iOS-9.0.json:
+        Since this was untested in older releases as well, remove
+        the protocol interfaces for legacy versions.
+
+2015-12-04  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Specifically Identify the Global Lexical Environment Scope
         https://bugs.webkit.org/show_bug.cgi?id=151828
 
index 27136ce..a3c2e3e 100644 (file)
@@ -88,7 +88,6 @@ InspectorBackend.registerCommand("Runtime.callFunctionOn", [{"name": "objectId",
 InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
 InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
 InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Runtime.run", [], []);
 InspectorBackend.registerCommand("Runtime.enable", [], []);
 InspectorBackend.registerCommand("Runtime.disable", [], []);
 InspectorBackend.activateDomain("Runtime");
@@ -310,21 +309,6 @@ InspectorBackend.registerCommand("Profiler.removeProfile", [{"name": "type", "ty
 InspectorBackend.registerCommand("Profiler.clearProfiles", [], []);
 InspectorBackend.activateDomain("Profiler");
 
-// Worker.
-InspectorBackend.registerWorkerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Worker");
-InspectorBackend.registerEvent("Worker.workerCreated", ["workerId", "url", "inspectorConnected"]);
-InspectorBackend.registerEvent("Worker.workerTerminated", ["workerId"]);
-InspectorBackend.registerEvent("Worker.dispatchMessageFromWorker", ["workerId", "message"]);
-InspectorBackend.registerEvent("Worker.disconnectedFromWorker", []);
-InspectorBackend.registerCommand("Worker.enable", [], []);
-InspectorBackend.registerCommand("Worker.disable", [], []);
-InspectorBackend.registerCommand("Worker.sendMessageToWorker", [{"name": "workerId", "type": "number", "optional": false}, {"name": "message", "type": "object", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.canInspectWorkers", [], ["result"]);
-InspectorBackend.registerCommand("Worker.connectToWorker", [{"name": "workerId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.disconnectFromWorker", [{"name": "workerId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.setAutoconnectToWorkers", [{"name": "value", "type": "boolean", "optional": false}], []);
-InspectorBackend.activateDomain("Worker");
-
 // LayerTree.
 InspectorBackend.registerLayerTreeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "LayerTree");
 InspectorBackend.registerEvent("LayerTree.layerTreeDidChange", []);
index 9264785..4774ec9 100644 (file)
@@ -116,7 +116,6 @@ InspectorBackend.registerCommand("Runtime.callFunctionOn", [{"name": "objectId",
 InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
 InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
 InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Runtime.run", [], []);
 InspectorBackend.registerCommand("Runtime.enable", [], []);
 InspectorBackend.registerCommand("Runtime.disable", [], []);
 InspectorBackend.activateDomain("Runtime");
@@ -343,18 +342,3 @@ InspectorBackend.registerEvent("Timeline.recordingStopped", []);
 InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}], []);
 InspectorBackend.registerCommand("Timeline.stop", [], []);
 InspectorBackend.activateDomain("Timeline", "web");
-
-// Worker.
-InspectorBackend.registerWorkerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Worker");
-InspectorBackend.registerEvent("Worker.workerCreated", ["workerId", "url", "inspectorConnected"]);
-InspectorBackend.registerEvent("Worker.workerTerminated", ["workerId"]);
-InspectorBackend.registerEvent("Worker.dispatchMessageFromWorker", ["workerId", "message"]);
-InspectorBackend.registerEvent("Worker.disconnectedFromWorker", []);
-InspectorBackend.registerCommand("Worker.enable", [], []);
-InspectorBackend.registerCommand("Worker.disable", [], []);
-InspectorBackend.registerCommand("Worker.sendMessageToWorker", [{"name": "workerId", "type": "number", "optional": false}, {"name": "message", "type": "object", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.canInspectWorkers", [], ["result"]);
-InspectorBackend.registerCommand("Worker.connectToWorker", [{"name": "workerId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.disconnectFromWorker", [{"name": "workerId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.setAutoconnectToWorkers", [{"name": "value", "type": "boolean", "optional": false}], []);
-InspectorBackend.activateDomain("Worker", "web");
index c61d47b..303a311 100644 (file)
@@ -322,7 +322,6 @@ InspectorBackend.registerCommand("Runtime.getCollectionEntries", [{"name": "obje
 InspectorBackend.registerCommand("Runtime.saveResult", [{"name": "value", "type": "object", "optional": false}, {"name": "contextId", "type": "number", "optional": true}], ["savedResultIndex"]);
 InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
 InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Runtime.run", [], []);
 InspectorBackend.registerCommand("Runtime.enable", [], []);
 InspectorBackend.registerCommand("Runtime.disable", [], []);
 InspectorBackend.registerCommand("Runtime.getRuntimeTypesForVariablesAtOffsets", [{"name": "locations", "type": "object", "optional": false}], ["types"]);
@@ -340,18 +339,3 @@ InspectorBackend.registerEvent("Timeline.recordingStopped", []);
 InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}], []);
 InspectorBackend.registerCommand("Timeline.stop", [], []);
 InspectorBackend.activateDomain("Timeline", "web");
-
-// Worker.
-InspectorBackend.registerWorkerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Worker");
-InspectorBackend.registerEvent("Worker.workerCreated", ["workerId", "url", "inspectorConnected"]);
-InspectorBackend.registerEvent("Worker.workerTerminated", ["workerId"]);
-InspectorBackend.registerEvent("Worker.dispatchMessageFromWorker", ["workerId", "message"]);
-InspectorBackend.registerEvent("Worker.disconnectedFromWorker", []);
-InspectorBackend.registerCommand("Worker.enable", [], []);
-InspectorBackend.registerCommand("Worker.disable", [], []);
-InspectorBackend.registerCommand("Worker.sendMessageToWorker", [{"name": "workerId", "type": "number", "optional": false}, {"name": "message", "type": "object", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.canInspectWorkers", [], ["result"]);
-InspectorBackend.registerCommand("Worker.connectToWorker", [{"name": "workerId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.disconnectFromWorker", [{"name": "workerId", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Worker.setAutoconnectToWorkers", [{"name": "value", "type": "boolean", "optional": false}], []);
-InspectorBackend.activateDomain("Worker", "web");
index 9389fe5..f6b4932 100644 (file)
                 "description": "Releases all remote objects that belong to a given group."
             },
             {
-                "name": "run",
-                "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
-            },
-            {
                 "name": "enable",
                 "description": "Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context."
             },
         ]
     },
     {
-        "domain": "Worker",
-        "types": [],
-        "commands": [
-            {
-                "name": "enable"
-            },
-            {
-                "name": "disable"
-            },
-            {
-                "name": "sendMessageToWorker",
-                "parameters": [
-                    { "name": "workerId", "type": "integer" },
-                    { "name": "message", "type": "object" }
-                ]
-            },
-            {
-                "name": "canInspectWorkers",
-                "description": "Tells whether browser supports workers inspection.",
-                "returns": [
-                    { "name": "result", "type": "boolean", "description": "True if browser has workers support." }
-                ]
-            },
-            {
-                "name": "connectToWorker",
-                "parameters": [
-                    { "name": "workerId", "type": "integer" }
-                ]
-            },
-            {
-                "name": "disconnectFromWorker",
-                "parameters": [
-                    { "name": "workerId", "type": "integer" }
-                ]
-            },
-            {
-                "name": "setAutoconnectToWorkers",
-                "parameters": [
-                    { "name": "value", "type": "boolean" }
-                ]
-            }
-        ],
-        "events": [
-            {
-                "name": "workerCreated",
-                "parameters": [
-                    { "name": "workerId", "type": "integer" },
-                    { "name": "url", "type": "string" },
-                    { "name": "inspectorConnected", "type": "boolean" }
-                ]
-            },
-            {
-                "name": "workerTerminated",
-                "parameters": [
-                    { "name": "workerId", "type": "integer" }
-                ]
-            },
-            {
-                "name": "dispatchMessageFromWorker",
-                "parameters": [
-                    { "name": "workerId", "type": "integer" },
-                    { "name": "message", "type": "object" }
-                ]
-            },
-            {
-                "name": "disconnectedFromWorker"
-            }
-        ]
-    },
-    {
         "domain": "LayerTree",
         "types": [
             {
index f8b0de3..f5b7a4c 100644 (file)
             "description": "Releases all remote objects that belong to a given group."
         },
         {
-            "name": "run",
-            "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
-        },
-        {
             "name": "enable",
             "description": "Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context."
         },
         }
     ]
 }
-,
-{
-    "domain": "Worker",
-    "availability": "web",
-    "types": [],
-    "commands": [
-        {
-            "name": "enable"
-        },
-        {
-            "name": "disable"
-        },
-        {
-            "name": "sendMessageToWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "message", "type": "object" }
-            ]
-        },
-        {
-            "name": "canInspectWorkers",
-            "description": "Tells whether browser supports workers inspection.",
-            "returns": [
-                { "name": "result", "type": "boolean", "description": "True if browser has workers support." }
-            ]
-        },
-        {
-            "name": "connectToWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "disconnectFromWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "setAutoconnectToWorkers",
-            "parameters": [
-                { "name": "value", "type": "boolean" }
-            ]
-        }
-    ],
-    "events": [
-        {
-            "name": "workerCreated",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "url", "type": "string" },
-                { "name": "inspectorConnected", "type": "boolean" }
-            ]
-        },
-        {
-            "name": "workerTerminated",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "dispatchMessageFromWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "message", "type": "object" }
-            ]
-        },
-        {
-            "name": "disconnectedFromWorker"
-        }
-    ]
-}
 ]}
index 6dd9e23..dde4190 100644 (file)
             "description": "Releases all remote objects that belong to a given group."
         },
         {
-            "name": "run",
-            "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
-        },
-        {
             "name": "enable",
             "description": "Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context."
         },
         }
     ]
 }
-,
-{
-    "domain": "Worker",
-    "types": [],
-    "availability": "web",
-    "commands": [
-        {
-            "name": "enable"
-        },
-        {
-            "name": "disable"
-        },
-        {
-            "name": "sendMessageToWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "message", "type": "object" }
-            ]
-        },
-        {
-            "name": "canInspectWorkers",
-            "description": "Tells whether browser supports workers inspection.",
-            "returns": [
-                { "name": "result", "type": "boolean", "description": "True if browser has workers support." }
-            ]
-        },
-        {
-            "name": "connectToWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "disconnectFromWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "setAutoconnectToWorkers",
-            "parameters": [
-                { "name": "value", "type": "boolean" }
-            ]
-        }
-    ],
-    "events": [
-        {
-            "name": "workerCreated",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "url", "type": "string" },
-                { "name": "inspectorConnected", "type": "boolean" }
-            ]
-        },
-        {
-            "name": "workerTerminated",
-            "parameters": [
-                { "name": "workerId", "type": "integer" }
-            ]
-        },
-        {
-            "name": "dispatchMessageFromWorker",
-            "parameters": [
-                { "name": "workerId", "type": "integer" },
-                { "name": "message", "type": "object" }
-            ]
-        },
-        {
-            "name": "disconnectedFromWorker"
-        }
-    ]
-}
 ]}