Title: [101140] trunk/Source/WebCore
- Revision
- 101140
- Author
- [email protected]
- Date
- 2011-11-24 08:36:29 -0800 (Thu, 24 Nov 2011)
Log Message
Web Inspector: WebInspector.inspectedPageDomain is not calculated for about:blank
https://bugs.webkit.org/show_bug.cgi?id=73082
Patch by Pavel Feldman <[email protected]> on 2011-11-24
Reviewed by Timothy Hatcher.
* inspector/front-end/ResourceTreeModel.js:
(WebInspector.ResourceTreeModel.prototype._processCachedResources):
(WebInspector.ResourceTreeModel.prototype._frameNavigated):
(WebInspector.ResourceTreeModel.prototype._addFramesRecursively):
* inspector/front-end/inspector.js:
(WebInspector.networkResourceById):
(WebInspector.get inspectedPageDomain):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101139 => 101140)
--- trunk/Source/WebCore/ChangeLog 2011-11-24 15:12:41 UTC (rev 101139)
+++ trunk/Source/WebCore/ChangeLog 2011-11-24 16:36:29 UTC (rev 101140)
@@ -1,3 +1,18 @@
+2011-11-24 Pavel Feldman <[email protected]>
+
+ Web Inspector: WebInspector.inspectedPageDomain is not calculated for about:blank
+ https://bugs.webkit.org/show_bug.cgi?id=73082
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/front-end/ResourceTreeModel.js:
+ (WebInspector.ResourceTreeModel.prototype._processCachedResources):
+ (WebInspector.ResourceTreeModel.prototype._frameNavigated):
+ (WebInspector.ResourceTreeModel.prototype._addFramesRecursively):
+ * inspector/front-end/inspector.js:
+ (WebInspector.networkResourceById):
+ (WebInspector.get inspectedPageDomain):
+
2011-11-24 Andrey Kosyakov <[email protected]>
Web Inspector: provide context menu items to open resources using extensions
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (101139 => 101140)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-11-24 15:12:41 UTC (rev 101139)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-11-24 16:36:29 UTC (rev 101140)
@@ -87,7 +87,6 @@
this._addFramesRecursively(mainFramePayload);
WebInspector.inspectedPageURL = mainFramePayload.frame.url;
- WebInspector.inspectedPageDomain = WebInspector.inspectedPageURL.asParsedURL().host;
this._dispatchInspectedURLChanged();
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);
@@ -141,10 +140,8 @@
if (isMainFrame) {
this._cleanupFramesAfterNavigation(frame);
- if (this.resourceForURL(frame.url)) {
+ if (this.resourceForURL(frame.url))
WebInspector.inspectedPageURL = frame.url;
- WebInspector.inspectedPageDomain = WebInspector.inspectedPageURL.asParsedURL().host;
- }
}
// Do nothing unless cached resource tree is processed - it will overwrite everything.
if (!this._cachedResourcesProcessed)
@@ -381,7 +378,6 @@
if (!framePayload.parentId) {
WebInspector.inspectedPageURL = frameResource.url;
- WebInspector.inspectedPageDomain = WebInspector.inspectedPageURL.asParsedURL().host;
this._currentMainFrameId = framePayload.id;
}
this._addFrame(framePayload);
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (101139 => 101140)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-11-24 15:12:41 UTC (rev 101139)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-11-24 16:36:29 UTC (rev 101140)
@@ -272,6 +272,12 @@
networkResourceById: function(id)
{
return this.panels.network.resourceById(id);
+ },
+
+ get inspectedPageDomain()
+ {
+ var parsedURL = WebInspector.inspectedPageURL && WebInspector.inspectedPageURL.asParsedURL();
+ return parsedURL ? parsedURL.host : "";
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
