Title: [101633] trunk/Source/WebCore
- Revision
- 101633
- Author
- pfeld...@chromium.org
- Date
- 2011-12-01 00:26:11 -0800 (Thu, 01 Dec 2011)
Log Message
Web Inspector: fix dedicated workers inspection (undefined is not an object).
https://bugs.webkit.org/show_bug.cgi?id=73537
Reviewed by Yury Semikhatsky.
* inspector/front-end/ResourceTreeModel.js:
(WebInspector.ResourceTreeModel.prototype.resourceForURL):
* inspector/front-end/WorkerManager.js:
(WebInspector.WorkerManager.loadCompleted):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101632 => 101633)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 08:16:14 UTC (rev 101632)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 08:26:11 UTC (rev 101633)
@@ -1,3 +1,15 @@
+2011-12-01 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: fix dedicated workers inspection (undefined is not an object).
+ https://bugs.webkit.org/show_bug.cgi?id=73537
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/ResourceTreeModel.js:
+ (WebInspector.ResourceTreeModel.prototype.resourceForURL):
+ * inspector/front-end/WorkerManager.js:
+ (WebInspector.WorkerManager.loadCompleted):
+
2011-12-01 Kentaro Hara <hara...@chromium.org>
[JSC] When XXXX has a NamedConstructor, window.XXXX should be XXXXConstructor
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (101632 => 101633)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-12-01 08:16:14 UTC (rev 101632)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-12-01 08:26:11 UTC (rev 101633)
@@ -282,7 +282,8 @@
resourceForURL: function(url)
{
- return this.mainFrame.resourceForURL(url);
+ // Workers call into this with no frames available.
+ return this.mainFrame ? this.mainFrame.resourceForURL(url) : null;
},
_addFramesRecursively: function(parentFrame, frameTreePayload)
Modified: trunk/Source/WebCore/inspector/front-end/WorkerManager.js (101632 => 101633)
--- trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-12-01 08:16:14 UTC (rev 101632)
+++ trunk/Source/WebCore/inspector/front-end/WorkerManager.js 2011-12-01 08:26:11 UTC (rev 101633)
@@ -68,7 +68,8 @@
WebInspector.WorkerManager._calculateWorkerInspectorTitle();
}
- WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, WebInspector.workerManager._mainFrameNavigated, WebInspector.workerManager);
+ if (WebInspector.workerManager)
+ WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, WebInspector.workerManager._mainFrameNavigated, WebInspector.workerManager);
}
WebInspector.WorkerManager._initializeDedicatedWorkerFrontend = function(workerId)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
