Title: [124005] trunk/Source/WebCore
- Revision
- 124005
- Author
- [email protected]
- Date
- 2012-07-30 01:57:44 -0700 (Mon, 30 Jul 2012)
Log Message
Web Inspector: workers inspector is broken in the remote debugging mode
https://bugs.webkit.org/show_bug.cgi?id=92540
Reviewed by Yury Semikhatsky.
The problem was that worker manager re-used complete url with query parameters
for spin-off worker front-ends. As a result, in case of remote debugging, newly
created front-ends were connecting to the same web socket (because of the ws parameter).
* inspector/front-end/WorkerManager.js:
(WebInspector.WorkerManager.isDedicatedWorkerFrontend):
* inspector/front-end/inspector.js:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124004 => 124005)
--- trunk/Source/WebCore/ChangeLog 2012-07-30 08:33:24 UTC (rev 124004)
+++ trunk/Source/WebCore/ChangeLog 2012-07-30 08:57:44 UTC (rev 124005)
@@ -1,3 +1,18 @@
+2012-07-30 Pavel Feldman <[email protected]>
+
+ Web Inspector: workers inspector is broken in the remote debugging mode
+ https://bugs.webkit.org/show_bug.cgi?id=92540
+
+ Reviewed by Yury Semikhatsky.
+
+ The problem was that worker manager re-used complete url with query parameters
+ for spin-off worker front-ends. As a result, in case of remote debugging, newly
+ created front-ends were connecting to the same web socket (because of the ws parameter).
+
+ * inspector/front-end/WorkerManager.js:
+ (WebInspector.WorkerManager.isDedicatedWorkerFrontend):
+ * inspector/front-end/inspector.js:
+
2012-07-30 Keishi Hattori <[email protected]>
Implement datalist UI for input type color for Chromium
Modified: trunk/Source/WebCore/inspector/front-end/WorkerManager.js (124004 => 124005)
--- trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2012-07-30 08:33:24 UTC (rev 124004)
+++ trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2012-07-30 08:57:44 UTC (rev 124005)
@@ -44,6 +44,11 @@
!!WebInspector.queryParamsObject["isSharedWorker"];
}
+WebInspector.WorkerManager.isDedicatedWorkerFrontend = function()
+{
+ return !!WebInspector.queryParamsObject["dedicatedWorkerId"];
+}
+
WebInspector.WorkerManager.loaded = function()
{
var workerId = WebInspector.queryParamsObject["dedicatedWorkerId"];
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (124004 => 124005)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2012-07-30 08:33:24 UTC (rev 124004)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2012-07-30 08:57:44 UTC (rev 124005)
@@ -389,6 +389,12 @@
{
InspectorBackend.loadFromJSONIfNeeded();
+ if (WebInspector.WorkerManager.isDedicatedWorkerFrontend()) {
+ // Do not create socket for the worker front-end.
+ WebInspector.doLoadedDone();
+ return;
+ }
+
var ws;
if ("ws" in WebInspector.queryParamsObject)
ws = "ws://" + WebInspector.queryParamsObject.ws;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
