[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 22912d49d3d1e3ce9ab938dd09dc27c9267ace1a
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 19:42:22 2010 +0000

    2010-11-03  Pavel Feldman  <pfeldman at 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):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71257 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 05e4999..54b0519 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-03  Pavel Feldman  <pfeldman at 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 at chromium.org>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index 409ad31..5a2e9e1 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -63,10 +63,6 @@ WebInspector.ResourceManager.prototype = {
     identifierForInitialRequest: function(identifier, url, loader)
     {
         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).
         this._bindResourceURL(resource);
@@ -259,6 +255,13 @@ WebInspector.ResourceManager.prototype = {
     didCommitLoadForFrame: function(frame, loader)
     {
         this._resourceTreeModel.didCommitLoadForFrame(frame, loader);
+        if (!frame.parentId) {
+            var mainResource = this.resourceForURL(frame.url);
+            if (mainResource) {
+                WebInspector.mainResource = mainResource;
+                mainResource.isMainResource = true;
+            }
+        }
     },
 
     frameDetachedFromParent: function(frameId)

-- 
WebKit Debian packaging