Changeset 122454 in webkit

Timestamp:

Jul 12, 2012 7:06:30 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: [Regression] Stale revisions should be removed on navigation.
​https://bugs.webkit.org/show_bug.cgi?id=91080

Reviewed by Pavel Feldman.

Moved all the code responsible for script mapping resetting to Workspace.
Stale revisions are removed in Workspace._reset now.

• inspector/front-end/ScriptSnippetModel.js:

(WebInspector.ScriptSnippetModel):

• inspector/front-end/StylesPanel.js:

(WebInspector.StylesUISourceCodeProvider):
(WebInspector.StylesUISourceCodeProvider.prototype._populate):
(WebInspector.StylesUISourceCodeProvider.prototype.reset):

• inspector/front-end/UISourceCode.js:

(WebInspector.UISourceCode.prototype._restoreRevisionHistory):

• inspector/front-end/Workspace.js:

(WebInspector.Workspace):
(WebInspector.Workspace.prototype._reset):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ScriptSnippetModel.js (modified) (1 diff)
• inspector/front-end/StylesPanel.js (modified) (4 diffs)
• inspector/front-end/UISourceCode.js (modified) (2 diffs)
• inspector/front-end/Workspace.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-12  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: [Regression] Stale revisions should be removed on navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=91080
+
+        Reviewed by Pavel Feldman.
+
+        Moved all the code responsible for script mapping resetting to Workspace.
+        Stale revisions are removed in Workspace._reset now.
+
+        * inspector/front-end/ScriptSnippetModel.js:
+        (WebInspector.ScriptSnippetModel):
+        * inspector/front-end/StylesPanel.js:
+        (WebInspector.StylesUISourceCodeProvider):
+        (WebInspector.StylesUISourceCodeProvider.prototype._populate):
+        (WebInspector.StylesUISourceCodeProvider.prototype.reset):
+        * inspector/front-end/UISourceCode.js:
+        (WebInspector.UISourceCode.prototype._restoreRevisionHistory):
+        * inspector/front-end/Workspace.js:
+        (WebInspector.Workspace):
+        (WebInspector.Workspace.prototype._reset):
+
 2012-07-12  Andreas Kling  <kling@webkit.org>
 

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

@@ -42 +42 @@
     this._lastSnippetEvaluationIndexSetting = WebInspector.settings.createSetting("lastSnippetEvaluationIndex", 0);
     this._snippetScriptMapping = new WebInspector.SnippetScriptMapping(this);
-    
-    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._reset, this);
 }
 

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

@@ -34 +34 @@
 WebInspector.StylesUISourceCodeProvider = function()
 {
-    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
-    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this.reset, this);
-
+    /**
+     * @type {Array.<WebInspector.UISourceCode>}
+     */
     this._uiSourceCodes = [];
+    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
 }
 
@@ -49 +50 @@
     },
 
-    _initialize: function()
-    {
-        if (this._initialized)
-            return;
-
+    _populate: function()
+    {
         function populateFrame(frame)
         {
@@ -63 +61 @@
                 this._resourceAdded({data:resources[i]});
         }
+
         populateFrame.call(this, WebInspector.resourceTreeModel.mainFrame);
-
-        WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
-        this._initialized = true;
     },
 
@@ -82 +78 @@
     {
         this._uiSourceCodes = [];
+        this._populate();
     }
 }

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

@@ -186 +186 @@
             return;
 
-        WebInspector.Revision._ensureStaleRevisionsFileteredOut();
         var registry = WebInspector.Revision._revisionHistoryRegistry();
         var historyItems = registry[this.url];
@@ -561 +560 @@
 }
 
-WebInspector.Revision._ensureStaleRevisionsFileteredOut = function()
+WebInspector.Revision.filterOutStaleRevisions = function()
 {
     if (!window.localStorage)
         return;
 
-    if (WebInspector.Revision._staleRevisionsFilteredOut)
-        return;
-    WebInspector.Revision._staleRevisionsFilteredOut = true;
-    
     var registry = WebInspector.Revision._revisionHistoryRegistry();
     var filteredRegistry = {};

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

@@ -131 +131 @@
     
     WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._reset, this);
+    WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._reset, this);
 }
 
@@ -153 +154 @@
             uiSourceCodeProviders[i].reset();
         }
+        WebInspector.Revision.filterOutStaleRevisions();
         this.dispatchEventToListeners(WebInspector.Workspace.Events.WorkspaceReset, null);
     }