Title: [134370] branches/chromium/1312
- Revision
- 134370
- Author
- [email protected]
- Date
- 2012-11-12 23:13:39 -0800 (Mon, 12 Nov 2012)
Log Message
Merge 133569 - Web Inspector: _javascript_ web workers debugging crashes
https://bugs.webkit.org/show_bug.cgi?id=101065
Reviewed by Alexander Pavlov.
Source/WebCore:
Clear m_pageInspector when page inspector instance is deleted.
Disable worker inspection when front-end disconnects.
Test: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html
* inspector/InspectorWorkerAgent.cpp:
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::~WorkerFrontendChannel): notify
WorkerMessagingProxy so that it can clear pointer to the channel.
LayoutTests:
Test that inspected page won't crash if inspected worker is terminated when it is paused
on a breakpoint.
* inspector-protocol/debugger-terminate-dedicated-worker-while-paused-expected.txt: Added.
* inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html: Added.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac/TestExpectations:
* platform/qt/TestExpectations:
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:
[email protected]
Review URL: https://codereview.chromium.org/11361236
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1312/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused-expected.txt (from rev 133569, trunk/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused-expected.txt) (0 => 134370)
--- branches/chromium/1312/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused-expected.txt (rev 0)
+++ branches/chromium/1312/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused-expected.txt 2012-11-13 07:13:39 UTC (rev 134370)
@@ -0,0 +1,8 @@
+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
+didEnableWorkerDebugging
+didConnectToWorker
+Worker paused
+SUCCESS: Did terminate paused worker
+
Copied: branches/chromium/1312/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html (from rev 133569, trunk/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html) (0 => 134370)
--- branches/chromium/1312/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html (rev 0)
+++ branches/chromium/1312/LayoutTests/inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html 2012-11-13 07:13:39 UTC (rev 134370)
@@ -0,0 +1,83 @@
+<html>
+<head>
+<script type="text/_javascript_" src=""
+<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)
+ {
+ InspectorTest.sendCommand("Worker.sendMessageToWorker",
+ {
+ "workerId": workerId,
+ "message": { "method": method,
+ "params": params,
+ "id": workerRequestId++
+ }
+ });
+ }
+
+ function didEnableWorkerDebugging(messageObject)
+ {
+ if ("error" in messageObject) {
+ InspectorTest.log("FAIL: Couldn't enable worker debugger: " + messageObject.error.message);
+ InspectorTest.completeTest();
+ return;
+ }
+ InspectorTest.log("didEnableWorkerDebugging");
+ }
+ InspectorTest.sendCommand("Worker.enable", {}, didEnableWorkerDebugging);
+
+
+ InspectorTest.eventHandler["Worker.workerCreated"] = function(messageObject)
+ {
+ workerId = messageObject["params"]["workerId"];
+ InspectorTest.log("Worker created");
+ InspectorTest.sendCommand("Worker.connectToWorker", { "workerId": workerId }, didConnectToWorker);
+
+ function didConnectToWorker(messageObject)
+ {
+ InspectorTest.log("didConnectToWorker");
+ sendCommandToWorker("Debugger.enable", {});
+ sendCommandToWorker("Debugger.pause", {});
+ }
+ }
+
+ InspectorTest.eventHandler["Worker.dispatchMessageFromWorker"] = function(messageObject)
+ {
+ var message = messageObject["params"]["message"];
+ if (message["method"] === "Debugger.paused") {
+ InspectorTest.log("Worker paused");
+ InspectorTest.sendCommand("Runtime.evaluate", { "_expression_": "worker.terminate()" }, didTerminateWorker);
+ }
+ }
+
+ function didTerminateWorker(messageObject)
+ {
+ InspectorTest.log("SUCCESS: Did terminate paused worker");
+ InspectorTest.completeTest();
+ }
+
+}
+</script>
+</head>
+<body _onLoad_="startWorkerAndRunTest();">Test that inspected page won't crash if inspected worker is terminated while it is paused. Test passes if it doesn't crash.
+<a href="" 101065.</a>
+</body>
+</html>
Modified: branches/chromium/1312/Source/WebCore/inspector/InspectorWorkerAgent.cpp (134369 => 134370)
--- branches/chromium/1312/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2012-11-13 06:59:25 UTC (rev 134369)
+++ branches/chromium/1312/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2012-11-13 07:13:39 UTC (rev 134370)
@@ -63,6 +63,7 @@
}
virtual ~WorkerFrontendChannel()
{
+ disconnectFromWorkerContext();
}
int id() const { return m_id; }
@@ -136,9 +137,9 @@
void InspectorWorkerAgent::clearFrontend()
{
+ m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, false);
+ disable(0);
m_inspectorFrontend = 0;
- m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, false);
- destroyWorkerFrontendChannels();
}
void InspectorWorkerAgent::enable(ErrorString*)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
