Title: [134194] branches/chromium/1271/Source/WebCore/inspector/WorkerInspectorController.cpp
- Revision
- 134194
- Author
- [email protected]
- Date
- 2012-11-12 00:13:04 -0800 (Mon, 12 Nov 2012)
Log Message
Merge 133030 - Web Inspector: page crash when pausing in dedicated worker
https://bugs.webkit.org/show_bug.cgi?id=100837
Reviewed by Pavel Feldman.
Source/WebCore:
Pass debugger agent to InjectedScriptHost::init in case of workers.
Test: inspector-protocol/debugger-pause-dedicated-worker.html
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
LayoutTests:
Test that Debugger.pause works for dedicated workers. The test is skipped
on all platforms that use JSC as worker debugging is not supported there
yet.
* http/tests/inspector-protocol/resources/InspectorTest.js:
(WebInspector.dispatchMessageFromBackend):
* inspector-protocol/debugger-pause-dedicated-worker-expected.txt: Added.
* inspector-protocol/debugger-pause-dedicated-worker.html: Added.
* inspector-protocol/resources/dedicated-worker.js: Added.
(onmessage):
(doWork):
* 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/11410030
Modified Paths
Diff
Modified: branches/chromium/1271/Source/WebCore/inspector/WorkerInspectorController.cpp (134193 => 134194)
--- branches/chromium/1271/Source/WebCore/inspector/WorkerInspectorController.cpp 2012-11-12 07:49:11 UTC (rev 134193)
+++ branches/chromium/1271/Source/WebCore/inspector/WorkerInspectorController.cpp 2012-11-12 08:13:04 UTC (rev 134194)
@@ -114,7 +114,9 @@
#endif
, 0
, 0
- , 0
+#if ENABLE(_javascript__DEBUGGER)
+ , m_debuggerAgent.get()
+#endif
);
#if ENABLE(_javascript__DEBUGGER)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
