Changeset 85048 in webkit

Timestamp:

Apr 27, 2011 5:37:13 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-27 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: clicking bookmarklet multiplies resources panel entries.
​https://bugs.webkit.org/show_bug.cgi?id=59590

• inspector/front-end/ResourceTreeModel.js: (WebInspector.ResourceTreeModel): (WebInspector.ResourceTreeModel.prototype._processCachedResources): (WebInspector.ResourceTreeModel.prototype._frameNavigated):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype._populateResourceTree): (WebInspector.FrameTreeElement): (WebInspector.FrameTreeElement.prototype.appendResource):
• inspector/front-end/inspector.js: (WebInspector.frontendReused):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ResourceTreeModel.js (modified) (4 diffs)
• inspector/front-end/ResourcesPanel.js (modified) (7 diffs)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: clicking bookmarklet multiplies resources panel entries.
+        https://bugs.webkit.org/show_bug.cgi?id=59590
+
+        * inspector/front-end/ResourceTreeModel.js:
+        (WebInspector.ResourceTreeModel):
+        (WebInspector.ResourceTreeModel.prototype._processCachedResources):
+        (WebInspector.ResourceTreeModel.prototype._frameNavigated):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._populateResourceTree):
+        (WebInspector.FrameTreeElement):
+        (WebInspector.FrameTreeElement.prototype.appendResource):
+        * inspector/front-end/inspector.js:
+        (WebInspector.frontendReused):
+
 2011-04-27  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js

@@ -45 +45 @@
     FrameDetached: "FrameDetached",
     ResourceAdded: "ResourceAdded",
+    WillLoadCachedResources: "WillLoadCachedResources",
     CachedResourcesLoaded: "CachedResourcesLoaded",
     DOMContentLoaded: "DOMContentLoaded",
@@ -65 +66 @@
             return;
 
+        this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources);
         WebInspector.mainResource = this._addFramesRecursively(mainFramePayload);
+        this._dispatchInspectedURLChanged(WebInspector.mainResource.url);
+        this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);
+
         this._cachedResourcesProcessed = true;
-
-        this._dispatchInspectedURLChanged(WebInspector.mainResource.url);
-
-        this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);
     },
 
@@ -116 +117 @@
 
         var isMainFrame = !frame.parentId;
-        if (isMainFrame)
-            this._dispatchInspectedURLChanged(WebInspector.mainResource.url);
 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, { frame: frame, loaderId: loaderId, isMainFrame: isMainFrame });
@@ -132 +131 @@
         }
 
-        if (isMainFrame && this.resourceForURL(frame.url))
+        if (isMainFrame && this.resourceForURL(frame.url)) {
             WebInspector.mainResource = this.resourceForURL(frame.url);
-
-        if (isMainFrame)
+            this._dispatchInspectedURLChanged(frame.url);
             WebInspector.Resource.clearRevisionHistory();
+        }
     },
 

trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js

@@ -179 +179 @@
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
         WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._cachedResourcesLoaded, this); 
+        WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetResourcesTree, this); 
 
         function populateFrame(frameId)
@@ -193 +194 @@
         }
         populateFrame.call(this, 0);
+
+        this._initDefaultSelection();
     },
 
@@ -258 +261 @@
         if (event.data.isMainFrame) {
             // Total update.
-            this.resourcesListTreeElement.removeChildren();
-            this._treeElementForFrameId = {};
-            this._reset();
+            this._resetResourcesTree();
             return;
         }
@@ -268 +269 @@
         if (frameTreeElement)
             frameTreeElement.removeChildren();        
+    },
+
+    _resetResourcesTree: function()
+    {
+        this.resourcesListTreeElement.removeChildren();
+        this._treeElementForFrameId = {};
+        this._reset();
     },
 
@@ -927 +935 @@
     this.setTitles(title, subtitle);
     this._categoryElements = {};
+    this._treeElementForResource = {};
 }
 
@@ -992 +1001 @@
     appendResource: function(resource)
     {
+        if (this._treeElementForResource[resource.url])
+            return;
+
         var categoryName = resource.category.name;
         var categoryElement = resource.category === WebInspector.resourceCategories.documents ? this : this._categoryElements[categoryName];
@@ -1002 +1014 @@
         this._insertInPresentationOrder(categoryElement, resourceTreeElement);
         resourceTreeElement._populateRevisions();
+
+        this._treeElementForResource[resource.url] = resourceTreeElement;
+    },
+
+    removeChildren: function()
+    {
+        WebInspector.BaseStorageTreeElement.prototype.removeChildren.call(this);
+        this._treeElementForResource = [];
     },
 

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

@@ -1368 +1368 @@
 WebInspector.frontendReused = function()
 {
+    ConsoleAgent.enable(this.console.setConsoleMessageExpiredCount.bind(this.console));
+    DatabaseAgent.enable();
+    DOMStorageAgent.enable();
+
     this.networkManager.frontendReused();
     this.resourceTreeModel.frontendReused();