<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193426] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193426">193426</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-04 10:50:05 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove untested and unused Worker inspection
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolRuntimejson">trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAllInOnecpp">trunk/Source/WebCore/inspector/InspectorAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWebAgentBaseh">trunk/Source/WebCore/inspector/InspectorWebAgentBase.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgenth">trunk/Source/WebCore/inspector/PageConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageScriptDebugServercpp">trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkercpp">trunk/Source/WebCore/workers/Worker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeProxyh">trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxyh">trunk/Source/WebCore/workers/WorkerMessagingProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerReportingProxyh">trunk/Source/WebCore/workers/WorkerReportingProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLegacy70InspectorBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLegacy80InspectorBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLegacy90InspectorBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS70json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS80json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS90json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-9.0.json</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordebuggerpausededicatedworkerexpectedtxt">trunk/LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerpausededicatedworkerhtml">trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerresourcesdedicatedworkerjs">trunk/LayoutTests/inspector/debugger/resources/dedicated-worker.js</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerterminatededicatedworkerwhilepausedexpectedtxt">trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerterminatededicatedworkerwhilepausedhtml">trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolWorkerjson">trunk/Source/JavaScriptCore/inspector/protocol/Worker.json</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptDebugServerh">trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgentcpp">trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgenth">trunk/Source/WebCore/inspector/InspectorWorkerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerResourceh">trunk/Source/WebCore/inspector/InspectorWorkerResource.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgentcpp">trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgenth">trunk/Source/WebCore/inspector/WorkerConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgenth">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllerh">trunk/Source/WebCore/inspector/WorkerInspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/LayoutTests/ChangeLog 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-12-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Web Inspector: Specifically Identify the Global Lexical Environment Scope
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151828
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpausededicatedworkerexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/LayoutTests/inspector/debugger/pause-dedicated-worker-expected.txt 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-Started worker
-Worker created
-didConnectToWorker
-SUCCESS: Worker paused
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerpausededicatedworkerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/LayoutTests/inspector/debugger/pause-dedicated-worker.html 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerresourcesdedicatedworkerjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/debugger/resources/dedicated-worker.js (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/resources/dedicated-worker.js 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/LayoutTests/inspector/debugger/resources/dedicated-worker.js 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-var message_id = 1;
-onmessage = function(event) {
- doWork();
-};
-
-function doWork() {
- postMessage("Message #" + message_id++);
- setTimeout(doWork, 50);
-}
</del></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerterminatededicatedworkerwhilepausedexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused-expected.txt 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerterminatededicatedworkerwhilepausedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/LayoutTests/inspector/debugger/terminate-dedicated-worker-while-paused.html 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-<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>
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1159,7 +1159,6 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Page.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Runtime.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Timeline.json
</span><del>- ${JAVASCRIPTCORE_DIR}/inspector/protocol/Worker.json
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-12-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Web Inspector: Specifically Identify the Global Lexical Environment Scope
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151828
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -194,7 +194,6 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Page.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Runtime.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Timeline.json \
</span><del>- $(JavaScriptCore)/inspector/protocol/Worker.json \
</del><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -113,14 +113,13 @@
</span><span class="cx"> Debugger& m_debugger;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-Debugger::Debugger(VM& vm, bool isInWorkerThread)
</del><ins>+Debugger::Debugger(VM& vm)
</ins><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_pauseOnExceptionsState(DontPauseOnExceptions)
</span><span class="cx"> , m_pauseOnNextStatement(false)
</span><span class="cx"> , m_isPaused(false)
</span><span class="cx"> , m_breakpointsActivated(true)
</span><span class="cx"> , m_hasHandlerForExceptionCallback(false)
</span><del>- , m_isInWorkerThread(isInWorkerThread)
</del><span class="cx"> , m_suppressAllPauses(false)
</span><span class="cx"> , m_steppingMode(SteppingModeDisabled)
</span><span class="cx"> , m_reasonForPause(NotPaused)
</span><span class="lines">@@ -707,13 +706,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> PauseReasonDeclaration reason(*this, PausedAtStartOfProgram);
</span><del>- // 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);
</del><ins>+ updateCallFrameAndPauseIfNeeded(callFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Debugger::didExecuteProgram(CallFrame* callFrame)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE Debugger {
</span><span class="cx"> public:
</span><del>- Debugger(VM&, bool isInWorkerThread = false);
</del><ins>+ Debugger(VM&);
</ins><span class="cx"> virtual ~Debugger();
</span><span class="cx">
</span><span class="cx"> VM& vm() { return m_vm; }
</span><span class="lines">@@ -198,7 +198,6 @@
</span><span class="cx"> bool m_isPaused : 1;
</span><span class="cx"> bool m_breakpointsActivated : 1;
</span><span class="cx"> bool m_hasHandlerForExceptionCallback : 1;
</span><del>- bool m_isInWorkerThread : 1;
</del><span class="cx"> bool m_suppressAllPauses : 1;
</span><span class="cx"> unsigned m_steppingMode : 1; // SteppingMode
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> JSGlobalObjectScriptDebugServer::JSGlobalObjectScriptDebugServer(JSGlobalObject& globalObject)
</span><del>- : ScriptDebugServer(globalObject.vm(), false)
</del><ins>+ : ScriptDebugServer(globalObject.vm())
</ins><span class="cx"> , m_globalObject(globalObject)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-ScriptDebugServer::ScriptDebugServer(VM& vm, bool isInWorkerThread)
- : Debugger(vm, isInWorkerThread)
</del><ins>+ScriptDebugServer::ScriptDebugServer(VM& vm)
+ : Debugger(vm)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> typedef HashSet<ScriptDebugListener*> ListenerSet;
</span><span class="cx"> typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
</span><span class="cx">
</span><del>- ScriptDebugServer(JSC::VM&, bool isInWorkerThread = false);
</del><ins>+ ScriptDebugServer(JSC::VM&);
</ins><span class="cx"> ~ScriptDebugServer();
</span><span class="cx">
</span><span class="cx"> virtual void attachDebugger() = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx"> virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override = 0;
</span><span class="cx"> virtual void addInspectedNode(ErrorString&, int nodeId) override = 0;
</span><span class="cx">
</span><del>- virtual bool isWorkerAgent() const = 0;
-
</del><span class="cx"> bool enabled() const { return m_enabled; }
</span><span class="cx"> void reset();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -241,11 +241,6 @@
</span><span class="cx"> m_injectedScriptManager.releaseObjectGroup(objectGroup);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::run(ErrorString&)
-{
- // FIXME: <https://webkit.org/b/127634> Web Inspector: support debugging web workers
-}
-
</del><span class="cx"> void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString& errorString, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
</span><span class="cx"> {
</span><span class="cx"> static const bool verbose = false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> 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;
</span><span class="cx"> virtual void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) override final;
</span><span class="cx"> virtual void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
</span><del>- virtual void run(ErrorString&) override;
</del><span class="cx"> virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
</span><span class="cx"> virtual void enableTypeProfiler(ErrorString&) override;
</span><span class="cx"> virtual void disableTypeProfiler(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> // FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
</span><span class="cx"> virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override;
</span><span class="cx"> virtual void addInspectedNode(ErrorString&, int nodeId) override;
</span><del>-
- virtual bool isWorkerAgent() const override { return false; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolRuntimejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -305,10 +305,6 @@
</span><span class="cx"> "description": "Releases all remote objects that belong to a given group."
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "run",
- "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
- },
- {
</del><span class="cx"> "name": "enable",
</span><span class="cx"> "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."
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolWorkerjson"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/protocol/Worker.json (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Worker.json 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Worker.json 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-{
- "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"
- }
- ]
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1259,7 +1259,6 @@
</span><span class="cx"> bindings/js/WebCoreJSBuiltins.cpp
</span><span class="cx"> bindings/js/WebCoreTypedArrayController.cpp
</span><span class="cx"> bindings/js/WorkerScriptController.cpp
</span><del>- bindings/js/WorkerScriptDebugServer.cpp
</del><span class="cx">
</span><span class="cx"> bridge/IdentifierRep.cpp
</span><span class="cx"> bridge/NP_jsobject.cpp
</span><span class="lines">@@ -1899,7 +1898,6 @@
</span><span class="cx"> inspector/InspectorPageAgent.cpp
</span><span class="cx"> inspector/InspectorStyleSheet.cpp
</span><span class="cx"> inspector/InspectorTimelineAgent.cpp
</span><del>- inspector/InspectorWorkerAgent.cpp
</del><span class="cx"> inspector/InstrumentingAgents.cpp
</span><span class="cx"> inspector/NetworkResourcesData.cpp
</span><span class="cx"> inspector/PageConsoleAgent.cpp
</span><span class="lines">@@ -1911,10 +1909,6 @@
</span><span class="cx"> inspector/WebDebuggerAgent.cpp
</span><span class="cx"> inspector/WebInjectedScriptHost.cpp
</span><span class="cx"> inspector/WebInjectedScriptManager.cpp
</span><del>- inspector/WorkerConsoleAgent.cpp
- inspector/WorkerDebuggerAgent.cpp
- inspector/WorkerInspectorController.cpp
- inspector/WorkerRuntimeAgent.cpp
</del><span class="cx">
</span><span class="cx"> loader/ContentFilter.cpp
</span><span class="cx"> loader/CookieJar.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/ChangeLog 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,3 +1,85 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-12-03 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix height computation of grid items with borders inside fr tracks
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -19056,20 +19056,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="..\plugins\DOMMimeType.cpp" />
</span><span class="cx"> <ClCompile Include="..\plugins\DOMMimeTypeArray.cpp" />
</span><span class="cx"> <ClCompile Include="..\plugins\DOMPlugin.cpp" />
</span><span class="lines">@@ -19567,20 +19553,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="..\inspector\InstrumentingAgents.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19707,34 +19679,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19763,34 +19707,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="..\mathml\MathMLAllInOne.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -22878,8 +22794,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorStyleSheet.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorTimelineAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorWebAgentBase.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorWorkerAgent.h" />
- <ClInclude Include="..\inspector\InspectorWorkerResource.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InstrumentingAgents.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\NetworkResourcesData.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageConsoleAgent.h" />
</span><span class="lines">@@ -22891,10 +22805,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebInjectedScriptHost.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebInjectedScriptManager.h" />
</span><del>- <ClInclude Include="..\inspector\WorkerConsoleAgent.h" />
- <ClInclude Include="..\inspector\WorkerDebuggerAgent.h" />
- <ClInclude Include="..\inspector\WorkerInspectorController.h" />
- <ClInclude Include="..\inspector\WorkerRuntimeAgent.h" />
</del><span class="cx"> <ClInclude Include="..\mathml\MathMLElement.h" />
</span><span class="cx"> <ClInclude Include="..\mathml\MathMLInlineContainerElement.h" />
</span><span class="cx"> <ClInclude Include="..\mathml\MathMLMathElement.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -4484,9 +4484,6 @@
</span><span class="cx"> <ClCompile Include="..\bindings\js\WorkerScriptController.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\WorkerScriptDebugServer.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\plugins\DOMMimeType.cpp">
</span><span class="cx"> <Filter>plugins</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4691,9 +4688,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\InspectorTimelineAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorWorkerAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InstrumentingAgents.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4727,18 +4721,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\WebInjectedScriptManager.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="..\mathml\MathMLAllInOne.cpp">
</span><span class="cx"> <Filter>rendering\mathml</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -11983,12 +11965,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorWebAgentBase.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorWorkerAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
- <ClInclude Include="..\inspector\InspectorWorkerResource.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InstrumentingAgents.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12022,18 +11998,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\WebInjectedScriptManager.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <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>
</del><span class="cx"> <ClInclude Include="..\mathml\MathMLElement.h">
</span><span class="cx"> <Filter>rendering\mathml</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -5424,8 +5424,8 @@
</span><span class="cx"> BC3BE9AB0E9C242000835588 /* RenderScrollbarPart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3BE9AA0E9C242000835588 /* RenderScrollbarPart.cpp */; };
</span><span class="cx"> BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */; };
</span><span class="cx"> BC3C39B70C0D3D8D005F4D7A /* JSMediaList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */; };
</span><del>- 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 = (); }; };
</del><ins>+ BC3D85BB1C0E2E7700D3B610 /* JSHTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC808B121C0E2B350066FD6B /* JSHTMLPictureElement.cpp */; };
+ BC3D85BC1C0E2E7A00D3B610 /* JSHTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC808B131C0E2B350066FD6B /* JSHTMLPictureElement.h */; };
</ins><span class="cx"> BC4368E80C226E32005EFB5F /* Rect.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4368E70C226E32005EFB5F /* Rect.h */; };
</span><span class="cx"> BC46C1EE0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */; };
</span><span class="cx"> BC46C1FA0C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC46C1F00C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp */; };
</span><span class="lines">@@ -5660,8 +5660,8 @@
</span><span class="cx"> BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065840F3CE2A700CD2D87 /* JSClientRect.h */; };
</span><span class="cx"> BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC065850F3CE2A700CD2D87 /* JSClientRectList.cpp */; };
</span><span class="cx"> BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065860F3CE2A700CD2D87 /* JSClientRectList.h */; };
</span><del>- 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 = (); }; };
</del><ins>+ BCC0E8751BFE70E9008F7F50 /* HTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC0E8731BFE70E9008F7F50 /* HTMLPictureElement.cpp */; };
+ BCC0E8761BFE70E9008F7F50 /* HTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC0E8741BFE70E9008F7F50 /* HTMLPictureElement.h */; };
</ins><span class="cx"> BCC438780E886CC700533DD5 /* JSHTMLInputElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC438770E886CC700533DD5 /* JSHTMLInputElementCustom.cpp */; };
</span><span class="cx"> BCC573350D695BBE006EF517 /* DOMProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC573330D695BBE006EF517 /* DOMProgressEvent.h */; };
</span><span class="cx"> BCC573360D695BBE006EF517 /* DOMProgressEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC573340D695BBE006EF517 /* DOMProgressEvent.mm */; };
</span><span class="lines">@@ -6595,24 +6595,11 @@
</span><span class="cx"> F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */; };
</span><span class="cx"> F34742DC134362F000531BC2 /* PageDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */; };
</span><span class="cx"> F34742DD134362F000531BC2 /* PageDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F34742DB134362F000531BC2 /* PageDebuggerAgent.h */; };
</span><del>- 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 */; };
</del><span class="cx"> F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F350B73413F1377D00880C43 /* InstrumentingAgents.cpp */; };
</span><del>- 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 */; };
</del><span class="cx"> F3820892147D35F90010BC06 /* PageConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */; };
</span><span class="cx"> F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088B147D35F90010BC06 /* PageConsoleAgent.h */; };
</span><span class="cx"> F3820894147D35F90010BC06 /* PageRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */; };
</span><span class="cx"> F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F382088D147D35F90010BC06 /* PageRuntimeAgent.h */; };
</span><del>- 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 */; };
</del><span class="cx"> F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */; };
</span><span class="cx"> F3D461481161D53200CA0D09 /* JSErrorHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */; };
</span><span class="cx"> F3D461491161D53200CA0D09 /* JSErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D461471161D53200CA0D09 /* JSErrorHandler.h */; };
</span><span class="lines">@@ -14513,24 +14500,11 @@
</span><span class="cx"> F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontendClientLocal.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageDebuggerAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F34742DB134362F000531BC2 /* PageDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageDebuggerAgent.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> F350B73413F1377D00880C43 /* InstrumentingAgents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InstrumentingAgents.cpp; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> F382088A147D35F90010BC06 /* PageConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageConsoleAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F382088B147D35F90010BC06 /* PageConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageConsoleAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageRuntimeAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F382088D147D35F90010BC06 /* PageRuntimeAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageRuntimeAgent.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstrumentingAgents.h; sourceTree = "<group>"; };
</span><span class="cx"> F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorHandler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F3D461471161D53200CA0D09 /* JSErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorHandler.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16028,9 +16002,6 @@
</span><span class="cx"> 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */,
</span><span class="cx"> 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */,
</span><span class="cx"> A593CF8A1840535200BFCE27 /* InspectorWebAgentBase.h */,
</span><del>- F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */,
- F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */,
- F375CC061150D300008DDB81 /* InspectorWorkerResource.h */,
</del><span class="cx"> F350B73413F1377D00880C43 /* InstrumentingAgents.cpp */,
</span><span class="cx"> F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */,
</span><span class="cx"> 59C27F04138D28C10079B7E2 /* NetworkResourcesData.cpp */,
</span><span class="lines">@@ -16055,14 +16026,6 @@
</span><span class="cx"> A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */,
</span><span class="cx"> A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
</span><span class="cx"> A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */,
</span><del>- F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
- F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
- F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */,
- F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */,
- F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */,
- F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */,
- F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */,
- F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */,
</del><span class="cx"> );
</span><span class="cx"> path = inspector;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -21996,8 +21959,6 @@
</span><span class="cx"> 0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */,
</span><span class="cx"> E1A643FC0EC097A000779668 /* WorkerScriptController.cpp */,
</span><span class="cx"> E1A643F10EC0972500779668 /* WorkerScriptController.h */,
</span><del>- F34742E61343635000531BC2 /* WorkerScriptDebugServer.cpp */,
- F34742E71343635000531BC2 /* WorkerScriptDebugServer.h */,
</del><span class="cx"> );
</span><span class="cx"> path = js;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -25967,8 +25928,6 @@
</span><span class="cx"> 82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
</span><span class="cx"> 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
</span><span class="cx"> A593CF8B1840535200BFCE27 /* InspectorWebAgentBase.h in Headers */,
</span><del>- F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */,
- F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */,
</del><span class="cx"> F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */,
</span><span class="cx"> B27535720B053814002CE64F /* IntPoint.h in Headers */,
</span><span class="cx"> E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */,
</span><span class="lines">@@ -28125,14 +28084,11 @@
</span><span class="cx"> A14832C6187F668F00DA63A6 /* WKViewPrivate.h in Headers */,
</span><span class="cx"> 379919971200DDF400EA041C /* WOFFFileFormat.h in Headers */,
</span><span class="cx"> 2E4346460F546A8200B0F1BA /* Worker.h in Headers */,
</span><del>- F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */,
- F34742E11343631F00531BC2 /* WorkerDebuggerAgent.h in Headers */,
</del><span class="cx"> A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */,
</span><span class="cx"> 2E4346490F546A8200B0F1BA /* WorkerGlobalScope.h in Headers */,
</span><span class="cx"> 5185FCB41BB4C4E80012898F /* WorkerGlobalScopeIndexedDatabase.h in Headers */,
</span><span class="cx"> 97F8E666151D4A4E00D2D181 /* WorkerGlobalScopeNotifications.h in Headers */,
</span><span class="cx"> 2E43464B0F546A8200B0F1BA /* WorkerGlobalScopeProxy.h in Headers */,
</span><del>- F36E07A51358A8BE00AACBC9 /* WorkerInspectorController.h in Headers */,
</del><span class="cx"> 18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers */,
</span><span class="cx"> 2E43464D0F546A8200B0F1BA /* WorkerLocation.h in Headers */,
</span><span class="cx"> 2E4346500F546A8200B0F1BA /* WorkerMessagingProxy.h in Headers */,
</span><span class="lines">@@ -28141,9 +28097,7 @@
</span><span class="cx"> 2E4346510F546A8200B0F1BA /* WorkerObjectProxy.h in Headers */,
</span><span class="cx"> 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */,
</span><span class="cx"> 2E4346530F546A8200B0F1BA /* WorkerRunLoop.h in Headers */,
</span><del>- F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */,
</del><span class="cx"> E1A643F20EC0972500779668 /* WorkerScriptController.h in Headers */,
</span><del>- F34742E91343635000531BC2 /* WorkerScriptDebugServer.h in Headers */,
</del><span class="cx"> A7D6B3490F61104500B79FD1 /* WorkerScriptLoader.h in Headers */,
</span><span class="cx"> 2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */,
</span><span class="cx"> 2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,
</span><span class="lines">@@ -29572,7 +29526,6 @@
</span><span class="cx"> 99CC0B6618BE9F15006CEBCC /* InspectorReplayAgent.cpp in Sources */,
</span><span class="cx"> 82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
</span><span class="cx"> 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
</span><del>- F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
</del><span class="cx"> F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */,
</span><span class="cx"> 2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */,
</span><span class="cx"> B27535600B053814002CE64F /* IntPointCG.cpp in Sources */,
</span><span class="lines">@@ -31518,20 +31471,15 @@
</span><span class="cx"> A14832C5187F668300DA63A6 /* WKView.mm in Sources */,
</span><span class="cx"> 379919961200DDF400EA041C /* WOFFFileFormat.cpp in Sources */,
</span><span class="cx"> 2E4346450F546A8200B0F1BA /* Worker.cpp in Sources */,
</span><del>- F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */,
- F34742E01343631F00531BC2 /* WorkerDebuggerAgent.cpp in Sources */,
</del><span class="cx"> A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */,
</span><span class="cx"> 2E4346480F546A8200B0F1BA /* WorkerGlobalScope.cpp in Sources */,
</span><span class="cx"> 5185FCB31BB4C4E80012898F /* WorkerGlobalScopeIndexedDatabase.cpp in Sources */,
</span><span class="cx"> 97F8E665151D4A4B00D2D181 /* WorkerGlobalScopeNotifications.cpp in Sources */,
</span><del>- F36E07A41358A8BE00AACBC9 /* WorkerInspectorController.cpp in Sources */,
</del><span class="cx"> 2E43464C0F546A8200B0F1BA /* WorkerLocation.cpp in Sources */,
</span><span class="cx"> 2E43464F0F546A8200B0F1BA /* WorkerMessagingProxy.cpp in Sources */,
</span><span class="cx"> E1271A140EEEC80400F61213 /* WorkerNavigator.cpp in Sources */,
</span><span class="cx"> 2E4346520F546A8200B0F1BA /* WorkerRunLoop.cpp in Sources */,
</span><del>- F3820898147D35F90010BC06 /* WorkerRuntimeAgent.cpp in Sources */,
</del><span class="cx"> E1A643FD0EC097A000779668 /* WorkerScriptController.cpp in Sources */,
</span><del>- F34742E81343635000531BC2 /* WorkerScriptDebugServer.cpp in Sources */,
</del><span class="cx"> A7D6B34A0F61104500B79FD1 /* WorkerScriptLoader.cpp in Sources */,
</span><span class="cx"> 2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */,
</span><span class="cx"> 0B9056F80F2685F30095FF6A /* WorkerThreadableLoader.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -148,4 +148,3 @@
</span><span class="cx"> #include "SerializedScriptValue.cpp"
</span><span class="cx"> #include "WebCoreTypedArrayController.cpp"
</span><span class="cx"> #include "WorkerScriptController.cpp"
</span><del>-#include "WorkerScriptDebugServer.cpp"
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "WebCoreJSClientData.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include "WorkerObjectProxy.h"
</span><del>-#include "WorkerScriptDebugServer.h"
</del><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <heap/StrongInlines.h>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,94 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptDebugServerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptDebugServer.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include "InspectorPageAgent.cpp"
</span><span class="cx"> #include "InspectorStyleSheet.cpp"
</span><span class="cx"> #include "InspectorTimelineAgent.cpp"
</span><del>-#include "InspectorWorkerAgent.cpp"
</del><span class="cx"> #include "InstrumentingAgents.cpp"
</span><span class="cx"> #include "NetworkResourcesData.cpp"
</span><span class="cx"> #include "PageConsoleAgent.cpp"
</span><span class="lines">@@ -62,7 +61,3 @@
</span><span class="cx"> #include "WebDebuggerAgent.cpp"
</span><span class="cx"> #include "WebInjectedScriptHost.cpp"
</span><span class="cx"> #include "WebInjectedScriptManager.cpp"
</span><del>-#include "WorkerConsoleAgent.cpp"
-#include "WorkerDebuggerAgent.cpp"
-#include "WorkerInspectorController.cpp"
-#include "WorkerRuntimeAgent.cpp"
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -44,10 +44,9 @@
</span><span class="cx"> addMessageToConsoleImpl(instrumentingAgentsForPage(page), WTF::move(message));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, std::unique_ptr<Inspector::ConsoleMessage> message)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope*, std::unique_ptr<Inspector::ConsoleMessage>)
</ins><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForWorkerGlobalScope(workerGlobalScope))
- addMessageToConsoleImpl(*instrumentingAgents, WTF::move(message));
</del><ins>+ // FIXME: <https://webkit.org/b/127634> Web Inspector: support debugging web workers
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InspectorReplayAgent.h"
</span><span class="cx"> #include "InspectorTimelineAgent.h"
</span><del>-#include "InspectorWorkerAgent.h"
</del><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "JSDOMWindow.h"
</span><span class="cx"> #include "JSDOMWindowCustom.h"
</span><span class="lines">@@ -153,7 +152,7 @@
</span><span class="cx"> InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(domStorageAgentPtr));
</span><span class="cx">
</span><del>- auto timelineAgentPtr = std::make_unique<InspectorTimelineAgent>(pageContext, pageAgent, InspectorTimelineAgent::PageInspector);
</del><ins>+ auto timelineAgentPtr = std::make_unique<InspectorTimelineAgent>(pageContext, pageAgent);
</ins><span class="cx"> m_timelineAgent = timelineAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(timelineAgentPtr));
</span><span class="cx">
</span><span class="lines">@@ -169,7 +168,6 @@
</span><span class="cx"> m_agents.append(std::make_unique<InspectorDOMDebuggerAgent>(pageContext, m_domAgent, debuggerAgent));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorHeapAgent>(pageContext));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(pageContext, pageAgent));
</span><del>- m_agents.append(std::make_unique<InspectorWorkerAgent>(pageContext));
</del><span class="cx"> m_agents.append(std::make_unique<InspectorLayerTreeAgent>(pageContext));
</span><span class="cx">
</span><span class="cx"> ASSERT(m_injectedScriptManager->commandLineAPIHost());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> #include "InspectorNetworkAgent.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InspectorTimelineAgent.h"
</span><del>-#include "InspectorWorkerAgent.h"
</del><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "PageDebuggerAgent.h"
</span><span class="lines">@@ -62,10 +61,6 @@
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "WebConsoleAgent.h"
</span><del>-#include "WorkerGlobalScope.h"
-#include "WorkerInspectorController.h"
-#include "WorkerRuntimeAgent.h"
-#include "WorkerThread.h"
</del><span class="cx"> #include "XMLHttpRequest.h"
</span><span class="cx"> #include <inspector/ConsoleMessage.h>
</span><span class="cx"> #include <inspector/ScriptArguments.h>
</span><span class="lines">@@ -911,38 +906,6 @@
</span><span class="cx"> domStorageAgent->didDispatchDOMStorageEvent(key, oldValue, newValue, storageType, securityOrigin, page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const URL& requestURL)
</span><span class="cx"> {
</span><span class="lines">@@ -1199,19 +1162,6 @@
</span><span class="cx"> return instrumentingAgentsForFrame(renderer->frame());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> void InspectorInstrumentation::layerTreeDidChangeImpl(InstrumentingAgents& instrumentingAgents)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents.inspectorLayerTreeAgent())
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -100,7 +100,6 @@
</span><span class="cx"> class ThreadableLoaderClient;
</span><span class="cx"> class URL;
</span><span class="cx"> class WorkerGlobalScope;
</span><del>-class WorkerGlobalScopeProxy;
</del><span class="cx"> class XMLHttpRequest;
</span><span class="cx">
</span><span class="cx"> struct ReplayPosition;
</span><span class="lines">@@ -225,11 +224,6 @@
</span><span class="cx">
</span><span class="cx"> static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="cx">
</span><del>- static bool shouldPauseDedicatedWorkerOnStart(ScriptExecutionContext*);
- static void didStartWorkerGlobalScope(ScriptExecutionContext*, WorkerGlobalScopeProxy*, const URL&);
- static void workerGlobalScopeTerminated(ScriptExecutionContext*, WorkerGlobalScopeProxy*);
- static void willEvaluateWorkerScript(WorkerGlobalScope*, int workerThreadStartMode);
-
</del><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> static void sessionCreated(Page&, RefPtr<ReplaySession>&&);
</span><span class="cx"> static void sessionLoaded(Page&, RefPtr<ReplaySession>&&);
</span><span class="lines">@@ -399,10 +393,6 @@
</span><span class="cx">
</span><span class="cx"> static void didDispatchDOMStorageEventImpl(InstrumentingAgents&, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="cx">
</span><del>- static bool shouldPauseDedicatedWorkerOnStartImpl(InstrumentingAgents&);
- static void didStartWorkerGlobalScopeImpl(InstrumentingAgents&, WorkerGlobalScopeProxy*, const URL&);
- static void workerGlobalScopeTerminatedImpl(InstrumentingAgents&, WorkerGlobalScopeProxy*);
-
</del><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> static void sessionCreatedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
</span><span class="cx"> static void sessionLoadedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
</span><span class="lines">@@ -446,9 +436,6 @@
</span><span class="cx"> static InstrumentingAgents* instrumentingAgentsForDocument(Document*);
</span><span class="cx"> static InstrumentingAgents* instrumentingAgentsForRenderer(RenderObject*);
</span><span class="cx">
</span><del>- static InstrumentingAgents* instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope*);
- static InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ScriptExecutionContext*);
-
</del><span class="cx"> static InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void pauseOnNativeEventIfNeeded(InstrumentingAgents&, bool isDOMEvent, const String& eventName, bool synchronous);
</span><span class="lines">@@ -1065,26 +1052,6 @@
</span><span class="cx"> didDispatchDOMStorageEventImpl(*instrumentingAgents, key, oldValue, newValue, storageType, securityOrigin, page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> inline void InspectorInstrumentation::didCreateWebSocket(Document* document, unsigned long identifier, const URL& requestURL)
</span><span class="cx"> {
</span><span class="lines">@@ -1276,7 +1243,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (is<Document>(*context))
</span><span class="cx"> return instrumentingAgentsForPage(downcast<Document>(context)->page());
</span><del>- return instrumentingAgentsForNonDocumentContext(context);
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForFrame(Frame* frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -594,12 +594,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTimelineAgent::InspectorTimelineAgent(WebAgentContext& context, InspectorPageAgent* pageAgent, InspectorType type)
</del><ins>+InspectorTimelineAgent::InspectorTimelineAgent(WebAgentContext& context, InspectorPageAgent* pageAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Timeline"), context)
</span><span class="cx"> , m_frontendDispatcher(std::make_unique<Inspector::TimelineFrontendDispatcher>(context.frontendRouter))
</span><span class="cx"> , m_backendDispatcher(Inspector::TimelineBackendDispatcher::create(context.backendDispatcher, this))
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><del>- , m_inspectorType(type)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -92,9 +92,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorTimelineAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- enum InspectorType { PageInspector, WorkerInspector };
-
- InspectorTimelineAgent(WebAgentContext&, InspectorPageAgent*, InspectorType);
</del><ins>+ InspectorTimelineAgent(WebAgentContext&, InspectorPageAgent*);
</ins><span class="cx"> virtual ~InspectorTimelineAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -200,7 +198,6 @@
</span><span class="cx"> int m_id { 1 };
</span><span class="cx"> int m_callStackDepth { 0 };
</span><span class="cx"> int m_maxCallStackDepth { 5 };
</span><del>- InspectorType m_inspectorType;
</del><span class="cx">
</span><span class="cx"> Vector<TimelineRecordEntry> m_pendingConsoleProfileRecords;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWebAgentBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWebAgentBase.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWebAgentBase.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorWebAgentBase.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class Page;
</span><del>-class WorkerGlobalScope;
</del><span class="cx">
</span><span class="cx"> // FIXME: move this to Inspector namespace when remaining agents move.
</span><span class="cx"> struct WebAgentContext : public Inspector::AgentContext {
</span><span class="lines">@@ -57,16 +56,6 @@
</span><span class="cx"> Page& inspectedPage;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct WorkerAgentContext : public WebAgentContext {
- WorkerAgentContext(WebAgentContext& context, WorkerGlobalScope& workerGlobalScope)
- : WebAgentContext(context)
- , workerGlobalScope(workerGlobalScope)
- {
- }
-
- WorkerGlobalScope& workerGlobalScope;
-};
-
</del><span class="cx"> class InspectorAgentBase : public Inspector::InspectorAgentBase {
</span><span class="cx"> protected:
</span><span class="cx"> InspectorAgentBase(const String& name, WebAgentContext& context)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,229 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerResourceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorWorkerResource.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerResource.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InspectorWorkerResource.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -32,12 +32,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx">
</span><del>-#include "InspectorController.h"
-#include "Page.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerInspectorController.h"
-#include <wtf/MainThread.h>
-
</del><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -57,7 +51,6 @@
</span><span class="cx"> m_inspectorDOMAgent = nullptr;
</span><span class="cx"> m_inspectorNetworkAgent = nullptr;
</span><span class="cx"> m_pageRuntimeAgent = nullptr;
</span><del>- m_workerRuntimeAgent = nullptr;
</del><span class="cx"> m_inspectorTimelineAgent = nullptr;
</span><span class="cx"> m_persistentInspectorTimelineAgent = nullptr;
</span><span class="cx"> m_inspectorDOMStorageAgent = nullptr;
</span><span class="lines">@@ -69,7 +62,6 @@
</span><span class="cx"> m_inspectorDebuggerAgent = nullptr;
</span><span class="cx"> m_pageDebuggerAgent = nullptr;
</span><span class="cx"> m_inspectorDOMDebuggerAgent = nullptr;
</span><del>- m_inspectorWorkerAgent = nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -55,13 +55,10 @@
</span><span class="cx"> class InspectorPageAgent;
</span><span class="cx"> class InspectorReplayAgent;
</span><span class="cx"> class InspectorTimelineAgent;
</span><del>-class InspectorWorkerAgent;
</del><span class="cx"> class Page;
</span><span class="cx"> class PageDebuggerAgent;
</span><span class="cx"> class PageRuntimeAgent;
</span><span class="cx"> class WebConsoleAgent;
</span><del>-class WorkerGlobalScope;
-class WorkerRuntimeAgent;
</del><span class="cx">
</span><span class="cx"> class InstrumentingAgents : public RefCounted<InstrumentingAgents> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InstrumentingAgents);
</span><span class="lines">@@ -99,9 +96,6 @@
</span><span class="cx"> PageRuntimeAgent* pageRuntimeAgent() const { return m_pageRuntimeAgent; }
</span><span class="cx"> void setPageRuntimeAgent(PageRuntimeAgent* agent) { m_pageRuntimeAgent = agent; }
</span><span class="cx">
</span><del>- WorkerRuntimeAgent* workerRuntimeAgent() const { return m_workerRuntimeAgent; }
- void setWorkerRuntimeAgent(WorkerRuntimeAgent* agent) { m_workerRuntimeAgent = agent; }
-
</del><span class="cx"> InspectorTimelineAgent* inspectorTimelineAgent() const { return m_inspectorTimelineAgent; }
</span><span class="cx"> void setInspectorTimelineAgent(InspectorTimelineAgent* agent) { m_inspectorTimelineAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -131,9 +125,6 @@
</span><span class="cx"> InspectorDOMDebuggerAgent* inspectorDOMDebuggerAgent() const { return m_inspectorDOMDebuggerAgent; }
</span><span class="cx"> void setInspectorDOMDebuggerAgent(InspectorDOMDebuggerAgent* agent) { m_inspectorDOMDebuggerAgent = agent; }
</span><span class="cx">
</span><del>- InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
- void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
-
</del><span class="cx"> InspectorLayerTreeAgent* inspectorLayerTreeAgent() const { return m_inspectorLayerTreeAgent; }
</span><span class="cx"> void setInspectorLayerTreeAgent(InspectorLayerTreeAgent* agent) { m_inspectorLayerTreeAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -150,7 +141,6 @@
</span><span class="cx"> InspectorDOMAgent* m_inspectorDOMAgent { nullptr };
</span><span class="cx"> InspectorNetworkAgent* m_inspectorNetworkAgent { nullptr };
</span><span class="cx"> PageRuntimeAgent* m_pageRuntimeAgent { nullptr };
</span><del>- WorkerRuntimeAgent* m_workerRuntimeAgent { nullptr };
</del><span class="cx"> InspectorTimelineAgent* m_inspectorTimelineAgent { nullptr };
</span><span class="cx"> InspectorTimelineAgent* m_persistentInspectorTimelineAgent { nullptr };
</span><span class="cx"> InspectorDOMStorageAgent* m_inspectorDOMStorageAgent { nullptr };
</span><span class="lines">@@ -162,7 +152,6 @@
</span><span class="cx"> Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent { nullptr };
</span><span class="cx"> PageDebuggerAgent* m_pageDebuggerAgent { nullptr };
</span><span class="cx"> InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent { nullptr };
</span><del>- InspectorWorkerAgent* m_inspectorWorkerAgent { nullptr };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> virtual ~PageConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isWorkerAgent() const override { return false; }
</del><span class="cx"> virtual void clearMessages(ErrorString&) override;
</span><span class="cx"> virtual void addInspectedNode(ErrorString&, int nodeId) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PageScriptDebugServer::PageScriptDebugServer(Page& page)
</span><del>- : ScriptDebugServer(WebCore::JSDOMWindowBase::commonVM(), false)
</del><ins>+ : ScriptDebugServer(WebCore::JSDOMWindowBase::commonVM())
</ins><span class="cx"> , m_page(page)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,137 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,210 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerInspectorController.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,98 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/Worker.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -161,8 +161,6 @@
</span><span class="cx"> dispatchEvent(Event::create(eventNames().errorEvent, false, true));
</span><span class="cx"> else {
</span><span class="cx"> WorkerThreadStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
</span><del>- if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(scriptExecutionContext()))
- startMode = PauseWorkerGlobalScopeOnStart;
</del><span class="cx"> m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), scriptExecutionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), startMode);
</span><span class="cx"> InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityOriginPolicy.h"
</span><span class="cx"> #include "URL.h"
</span><del>-#include "WorkerInspectorController.h"
</del><span class="cx"> #include "WorkerLocation.h"
</span><span class="cx"> #include "WorkerNavigator.h"
</span><span class="cx"> #include "WorkerObjectProxy.h"
</span><span class="lines">@@ -69,7 +68,6 @@
</span><span class="cx"> , m_userAgent(userAgent)
</span><span class="cx"> , m_script(std::make_unique<WorkerScriptController>(this))
</span><span class="cx"> , m_thread(thread)
</span><del>- , m_workerInspectorController(std::make_unique<WorkerInspectorController>(*this))
</del><span class="cx"> , m_closing(false)
</span><span class="cx"> , m_eventQueue(*this)
</span><span class="cx"> , m_topOrigin(topOrigin)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx">
</span><span class="cx"> class Blob;
</span><span class="cx"> class ScheduledAction;
</span><del>- class WorkerInspectorController;
</del><span class="cx"> class WorkerLocation;
</span><span class="cx"> class WorkerNavigator;
</span><span class="cx"> class WorkerThread;
</span><span class="lines">@@ -95,8 +94,6 @@
</span><span class="cx"> virtual bool isContextThread() const override;
</span><span class="cx"> virtual bool isJSExecutionForbidden() const override;
</span><span class="cx">
</span><del>- WorkerInspectorController& workerInspectorController() { return *m_workerInspectorController; }
-
</del><span class="cx"> // These methods are used for GC marking. See JSWorkerGlobalScope::visitChildrenVirtual(SlotVisitor&) in
</span><span class="cx"> // JSWorkerGlobalScopeCustom.cpp.
</span><span class="cx"> WorkerNavigator* optionalNavigator() const { return m_navigator.get(); }
</span><span class="lines">@@ -161,7 +158,6 @@
</span><span class="cx"> std::unique_ptr<WorkerScriptController> m_script;
</span><span class="cx"> WorkerThread& m_thread;
</span><span class="cx">
</span><del>- const std::unique_ptr<WorkerInspectorController> m_workerInspectorController;
</del><span class="cx"> bool m_closing;
</span><span class="cx">
</span><span class="cx"> HashSet<Observer*> m_workerObservers;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -59,15 +59,6 @@
</span><span class="cx"> virtual void workerObjectDestroyed() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void notifyNetworkStateChange(bool isOnline) = 0;
</span><del>-
- class PageInspector {
- public:
- virtual ~PageInspector() { }
- virtual void dispatchMessageFromWorker(const String&) = 0;
- };
- virtual void connectToInspector(PageInspector*) { }
- virtual void disconnectFromInspector() { }
- virtual void sendMessageToInspector(const String&) { }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -37,14 +37,10 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "InspectorInstrumentation.h"
</del><span class="cx"> #include "MessageEvent.h"
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "Worker.h"
</span><del>-#include "WorkerDebuggerAgent.h"
-#include "WorkerInspectorController.h"
-#include <inspector/InspectorAgentBase.h>
</del><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -63,7 +59,6 @@
</span><span class="cx"> , m_unconfirmedMessageCount(0)
</span><span class="cx"> , m_workerThreadHadPendingActivity(false)
</span><span class="cx"> , m_askedToTerminate(false)
</span><del>- , m_pageInspector(nullptr)
</del><span class="cx"> {
</span><span class="cx"> ASSERT(m_workerObject);
</span><span class="cx"> ASSERT((is<Document>(*m_scriptExecutionContext) && isMainThread())
</span><span class="lines">@@ -85,7 +80,6 @@
</span><span class="cx"> RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, sourceCode, *this, *this, startMode, document.contentSecurityPolicy()->deprecatedHeader(), document.contentSecurityPolicy()->deprecatedHeaderType(), document.topOrigin());
</span><span class="cx"> workerThreadCreated(thread);
</span><span class="cx"> thread->start();
</span><del>- InspectorInstrumentation::didStartWorkerGlobalScope(m_scriptExecutionContext.get(), this, scriptURL);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
</span><span class="lines">@@ -211,38 +205,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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());
-}
-
</del><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeDestroyed()
</span><span class="cx"> {
</span><span class="cx"> m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</span><span class="lines">@@ -266,8 +228,6 @@
</span><span class="cx"> m_askedToTerminate = true;
</span><span class="cx"> m_workerThread = nullptr;
</span><span class="cx">
</span><del>- InspectorInstrumentation::workerGlobalScopeTerminated(m_scriptExecutionContext.get(), this);
-
</del><span class="cx"> if (m_mayBeDestroyed)
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="lines">@@ -280,19 +240,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_workerThread)
</span><span class="cx"> m_workerThread->stop();
</span><del>-
- InspectorInstrumentation::workerGlobalScopeTerminated(m_scriptExecutionContext.get(), this);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
-{
- StringCapture capturedMessage(message);
- m_scriptExecutionContext->postTask([this, capturedMessage] (ScriptExecutionContext&) {
- if (m_pageInspector)
- m_pageInspector->dispatchMessageFromWorker(capturedMessage.string());
- });
-}
-
</del><span class="cx"> void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
</span><span class="cx"> {
</span><span class="cx"> m_scriptExecutionContext->postTask([this, hasPendingActivity] (ScriptExecutionContext&) {
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -58,16 +58,11 @@
</span><span class="cx"> virtual void workerObjectDestroyed() override;
</span><span class="cx"> virtual void notifyNetworkStateChange(bool isOnline) override;
</span><span class="cx">
</span><del>- virtual void connectToInspector(WorkerGlobalScopeProxy::PageInspector*) override;
- virtual void disconnectFromInspector() override;
- virtual void sendMessageToInspector(const String&) override;
-
</del><span class="cx"> // Implementations of WorkerObjectProxy.
</span><span class="cx"> // (Only use these methods in the worker context thread.)
</span><span class="cx"> virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
</span><span class="cx"> virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) override;
</span><span class="cx"> virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) override;
</span><del>- virtual void postMessageToPageInspector(const String&) override;
</del><span class="cx"> virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) override;
</span><span class="cx"> virtual void reportPendingActivity(bool hasPendingActivity) override;
</span><span class="cx"> virtual void workerGlobalScopeClosed() override;
</span><span class="lines">@@ -89,7 +84,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class MessageWorkerTask;
</span><del>- friend class PostMessageToPageInspectorTask;
</del><span class="cx"> friend class WorkerGlobalScopeDestroyedTask;
</span><span class="cx"> friend class WorkerExceptionTask;
</span><span class="cx"> friend class WorkerThreadActivityReportTask;
</span><span class="lines">@@ -109,7 +103,6 @@
</span><span class="cx"> bool m_askedToTerminate;
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<ScriptExecutionContext::Task>> m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
</span><del>- WorkerGlobalScopeProxy::PageInspector* m_pageInspector;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerReportingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerReportingProxy.h (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerReportingProxy.h 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerReportingProxy.h 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) = 0;
</span><span class="cx">
</span><del>- virtual void postMessageToPageInspector(const String&) = 0;
-
</del><span class="cx"> // Invoked when close() is invoked on the worker context.
</span><span class="cx"> virtual void workerGlobalScopeClosed() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx">
</span><span class="cx"> #include "DedicatedWorkerGlobalScope.h"
</span><del>-#include "InspectorInstrumentation.h"
</del><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "ThreadGlobalData.h"
</span><span class="lines">@@ -147,7 +146,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerScriptController* script = m_workerGlobalScope->script();
</span><del>- InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), m_startupData->m_startMode);
</del><span class="cx"> script->evaluate(ScriptSourceCode(m_startupData->m_sourceCode, m_startupData->m_scriptURL));
</span><span class="cx"> // Free the startup data to cause its member variable deref's happen on the worker's thread (since
</span><span class="cx"> // all ref/derefs of these objects are happening on the thread at this point). Note that
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Web Inspector: Specifically Identify the Global Lexical Environment Scope
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151828
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLegacy70InspectorBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
</span><del>-InspectorBackend.registerCommand("Runtime.run", [], []);
</del><span class="cx"> InspectorBackend.registerCommand("Runtime.enable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.disable", [], []);
</span><span class="cx"> InspectorBackend.activateDomain("Runtime");
</span><span class="lines">@@ -310,21 +309,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Profiler.clearProfiles", [], []);
</span><span class="cx"> InspectorBackend.activateDomain("Profiler");
</span><span class="cx">
</span><del>-// 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");
-
</del><span class="cx"> // LayerTree.
</span><span class="cx"> InspectorBackend.registerLayerTreeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "LayerTree");
</span><span class="cx"> InspectorBackend.registerEvent("LayerTree.layerTreeDidChange", []);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLegacy80InspectorBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
</span><del>-InspectorBackend.registerCommand("Runtime.run", [], []);
</del><span class="cx"> InspectorBackend.registerCommand("Runtime.enable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.disable", [], []);
</span><span class="cx"> InspectorBackend.activateDomain("Runtime");
</span><span class="lines">@@ -343,18 +342,3 @@
</span><span class="cx"> InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Timeline.stop", [], []);
</span><span class="cx"> InspectorBackend.activateDomain("Timeline", "web");
</span><del>-
-// 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");
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLegacy90InspectorBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/9.0/InspectorBackendCommands.js 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -322,7 +322,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.saveResult", [{"name": "value", "type": "object", "optional": false}, {"name": "contextId", "type": "number", "optional": true}], ["savedResultIndex"]);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
</span><del>-InspectorBackend.registerCommand("Runtime.run", [], []);
</del><span class="cx"> InspectorBackend.registerCommand("Runtime.enable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.disable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Runtime.getRuntimeTypesForVariablesAtOffsets", [{"name": "locations", "type": "object", "optional": false}], ["types"]);
</span><span class="lines">@@ -340,18 +339,3 @@
</span><span class="cx"> InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Timeline.stop", [], []);
</span><span class="cx"> InspectorBackend.activateDomain("Timeline", "web");
</span><del>-
-// 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");
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS70json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -546,10 +546,6 @@
</span><span class="cx"> "description": "Releases all remote objects that belong to a given group."
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "run",
- "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
- },
- {
</del><span class="cx"> "name": "enable",
</span><span class="cx"> "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."
</span><span class="cx"> },
</span><span class="lines">@@ -2589,76 +2585,6 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "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"
- }
- ]
- },
- {
</del><span class="cx"> "domain": "LayerTree",
</span><span class="cx"> "types": [
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS80json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -759,10 +759,6 @@
</span><span class="cx"> "description": "Releases all remote objects that belong to a given group."
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "run",
- "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
- },
- {
</del><span class="cx"> "name": "enable",
</span><span class="cx"> "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."
</span><span class="cx"> },
</span><span class="lines">@@ -3015,76 +3011,4 @@
</span><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span><del>-,
-{
- "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"
- }
- ]
-}
</del><span class="cx"> ]}
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS90json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-9.0.json (193425 => 193426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-9.0.json 2015-12-04 18:49:47 UTC (rev 193425)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-9.0.json 2015-12-04 18:50:05 UTC (rev 193426)
</span><span class="lines">@@ -3142,10 +3142,6 @@
</span><span class="cx"> "description": "Releases all remote objects that belong to a given group."
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "run",
- "description": "Tells inspected instance(worker or page) that it can run in case it was started paused."
- },
- {
</del><span class="cx"> "name": "enable",
</span><span class="cx"> "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."
</span><span class="cx"> },
</span><span class="lines">@@ -3311,76 +3307,4 @@
</span><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span><del>-,
-{
- "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"
- }
- ]
-}
</del><span class="cx"> ]}
</span></span></pre>
</div>
</div>
</body>
</html>