Title: [208011] trunk
- Revision
- 208011
- Author
- [email protected]
- Date
- 2016-10-27 15:19:37 -0700 (Thu, 27 Oct 2016)
Log Message
Web Inspector: Worker should recover if Inspector is closed and never sent Worker.initialized command
https://bugs.webkit.org/show_bug.cgi?id=164073
Reviewed by Brian Burg.
Source/WebCore:
Test: inspector/worker/worker-recover-if-inspector-close.html
* workers/WorkerInspectorProxy.cpp:
(WebCore::WorkerInspectorProxy::disconnectFromWorkerInspectorController):
Ensure we stop the debugger only task loop if needed when the last debugger
message comes in.
LayoutTests:
* inspector/worker/worker-recover-if-inspector-close-expected.txt: Added.
* inspector/worker/worker-recover-if-inspector-close.html: Added.
Test to ensure a Worker recovers when it is paused on opening waiting for
Inspector messages and the Inspector disconnects.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (208010 => 208011)
--- trunk/LayoutTests/ChangeLog 2016-10-27 22:19:33 UTC (rev 208010)
+++ trunk/LayoutTests/ChangeLog 2016-10-27 22:19:37 UTC (rev 208011)
@@ -1,5 +1,17 @@
2016-10-27 Joseph Pecoraro <[email protected]>
+ Web Inspector: Worker should recover if Inspector is closed and never sent Worker.initialized command
+ https://bugs.webkit.org/show_bug.cgi?id=164073
+
+ Reviewed by Brian Burg.
+
+ * inspector/worker/worker-recover-if-inspector-close-expected.txt: Added.
+ * inspector/worker/worker-recover-if-inspector-close.html: Added.
+ Test to ensure a Worker recovers when it is paused on opening waiting for
+ Inspector messages and the Inspector disconnects.
+
+2016-10-27 Joseph Pecoraro <[email protected]>
+
Web Inspector: Include ConsoleAgent in Workers - real console.log support
https://bugs.webkit.org/show_bug.cgi?id=163844
<rdar://problem/28903328>
Added: trunk/LayoutTests/inspector/worker/worker-recover-if-inspector-close-expected.txt (0 => 208011)
--- trunk/LayoutTests/inspector/worker/worker-recover-if-inspector-close-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/worker/worker-recover-if-inspector-close-expected.txt 2016-10-27 22:19:37 UTC (rev 208011)
@@ -0,0 +1,10 @@
+Tests that a Worker recovers and resumes if Web Inspector closes before sending Worker.initialized.
+
+
+== Running test suite: Worker.CreateAndTerminate
+-- Running test case: Worker.enable
+PAGE: Creating the worker.
+PASS: Worker.workerCreated
+PAGE: Closing the inspector.
+PASS: Worker recovered.
+
Added: trunk/LayoutTests/inspector/worker/worker-recover-if-inspector-close.html (0 => 208011)
--- trunk/LayoutTests/inspector/worker/worker-recover-if-inspector-close.html (rev 0)
+++ trunk/LayoutTests/inspector/worker/worker-recover-if-inspector-close.html 2016-10-27 22:19:37 UTC (rev 208011)
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<script>
+let worker;
+let expectingWorkerMessage = false;
+
+function createWorker() {
+ log("PAGE: Creating the worker.");
+ worker = new Worker("resources/worker-1.js");
+ worker.postMessage("hello");
+ worker._onmessage_ = function(event) {
+ if (expectingWorkerMessage) {
+ log("PASS: Worker recovered.");
+ testRunner.notifyDone();
+ } else {
+ log("FAIL: Worker should have been paused!");
+ log(event.data);
+ testRunner.notifyDone();
+ }
+ }
+}
+
+function closeInspectorFrontendAndCompleteTest() {
+ log("PAGE: Closing the inspector.");
+ expectingWorkerMessage = true;
+ window.internals.closeDummyInspectorFrontend();
+ setTimeout(() => {
+ log("FAIL: Never received message!");
+ testRunner.notifyDone();
+ }, 1000);
+}
+
+function test()
+{
+ let workerId;
+
+ let suite = ProtocolTest.createAsyncSuite("Worker.CreateAndTerminate");
+
+ suite.addTestCase({
+ name: "Worker.enable",
+ description: "Worker.enable informs the frontend of the two existing Workers",
+ test(resolve, reject) {
+ InspectorProtocol.awaitCommand({method: "Worker.enable", params: {}});
+ ProtocolTest.evaluateInPage("createWorker()");
+ InspectorProtocol.awaitEvent({event: "Worker.workerCreated"}).then((messageObject) => {
+ ProtocolTest.pass("Worker.workerCreated");
+
+ // Give the worker 50ms to prove it is waiting for Inspection initialization
+ // and is unable to message the page. Closing the inspector, the Worker should
+ // recover and resume execution.
+ setTimeout(() => {
+ ProtocolTest.evaluateInPage("closeInspectorFrontendAndCompleteTest()");
+ }, 50);
+ }).catch(reject);
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests that a Worker recovers and resumes if Web Inspector closes before sending Worker.initialized.</p>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (208010 => 208011)
--- trunk/Source/WebCore/ChangeLog 2016-10-27 22:19:33 UTC (rev 208010)
+++ trunk/Source/WebCore/ChangeLog 2016-10-27 22:19:37 UTC (rev 208011)
@@ -1,5 +1,19 @@
2016-10-27 Joseph Pecoraro <[email protected]>
+ Web Inspector: Worker should recover if Inspector is closed and never sent Worker.initialized command
+ https://bugs.webkit.org/show_bug.cgi?id=164073
+
+ Reviewed by Brian Burg.
+
+ Test: inspector/worker/worker-recover-if-inspector-close.html
+
+ * workers/WorkerInspectorProxy.cpp:
+ (WebCore::WorkerInspectorProxy::disconnectFromWorkerInspectorController):
+ Ensure we stop the debugger only task loop if needed when the last debugger
+ message comes in.
+
+2016-10-27 Joseph Pecoraro <[email protected]>
+
Web Inspector: Include ConsoleAgent in Workers - real console.log support
https://bugs.webkit.org/show_bug.cgi?id=163844
<rdar://problem/28903328>
Modified: trunk/Source/WebCore/workers/WorkerInspectorProxy.cpp (208010 => 208011)
--- trunk/Source/WebCore/workers/WorkerInspectorProxy.cpp 2016-10-27 22:19:33 UTC (rev 208010)
+++ trunk/Source/WebCore/workers/WorkerInspectorProxy.cpp 2016-10-27 22:19:37 UTC (rev 208011)
@@ -119,6 +119,10 @@
m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
downcast<WorkerGlobalScope>(context).inspectorController().disconnectFrontend(DisconnectReason::InspectorDestroyed);
+
+ // In case the worker is paused running debugger tasks, ensure we break out of
+ // the pause since this will be the last debugger task we send to the worker.
+ downcast<WorkerGlobalScope>(context).thread().stopRunningDebuggerTasks();
}, WorkerRunLoop::debuggerMode());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
