Changeset 71257 in webkit

Timestamp:

Nov 3, 2010 12:42:22 PM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2010-11-03 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: main resource is being re-assigned upon iframe's commit load.
​https://bugs.webkit.org/show_bug.cgi?id=48940

• inspector/front-end/ResourceManager.js: (WebInspector.ResourceManager.prototype.identifierForInitialRequest): (WebInspector.ResourceManager.prototype.didCommitLoadForFrame):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ResourceManager.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-03  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: main resource is being re-assigned upon iframe's commit load.
+        https://bugs.webkit.org/show_bug.cgi?id=48940
+
+        * inspector/front-end/ResourceManager.js:
+        (WebInspector.ResourceManager.prototype.identifierForInitialRequest):
+        (WebInspector.ResourceManager.prototype.didCommitLoadForFrame):
+
 2010-11-03  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/inspector/front-end/ResourceManager.js

@@ -64 +64 @@
     {
         var resource = this._createResource(identifier, url, loader);
-        if (loader.url === url) {
-            resource.isMainResource = true;
-            WebInspector.mainResource = resource;
-        }
 
         // It is important to bind resource url early (before scripts compile).
@@ -260 +256 @@
     {
         this._resourceTreeModel.didCommitLoadForFrame(frame, loader);
+        if (!frame.parentId) {
+            var mainResource = this.resourceForURL(frame.url);
+            if (mainResource) {
+                WebInspector.mainResource = mainResource;
+                mainResource.isMainResource = true;
+            }
+        }
     },