Diff
Modified: trunk/Source/WebCore/ChangeLog (122453 => 122454)
--- trunk/Source/WebCore/ChangeLog 2012-07-12 13:44:25 UTC (rev 122453)
+++ trunk/Source/WebCore/ChangeLog 2012-07-12 14:06:30 UTC (rev 122454)
@@ -1,3 +1,25 @@
+2012-07-12 Vsevolod Vlasov <[email protected]>
+
+ 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 <[email protected]>
Make ElementAttributeData a variable-sized object to reduce memory use.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (122453 => 122454)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-12 13:44:25 UTC (rev 122453)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-12 14:06:30 UTC (rev 122454)
@@ -41,8 +41,6 @@
this._snippetStorage = new WebInspector.SnippetStorage("script", "Script snippet #");
this._lastSnippetEvaluationIndexSetting = WebInspector.settings.createSetting("lastSnippetEvaluationIndex", 0);
this._snippetScriptMapping = new WebInspector.SnippetScriptMapping(this);
-
- WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._reset, this);
}
WebInspector.ScriptSnippetModel.snippetSourceURLPrefix = "snippets:///";
Modified: trunk/Source/WebCore/inspector/front-end/StylesPanel.js (122453 => 122454)
--- trunk/Source/WebCore/inspector/front-end/StylesPanel.js 2012-07-12 13:44:25 UTC (rev 122453)
+++ trunk/Source/WebCore/inspector/front-end/StylesPanel.js 2012-07-12 14:06:30 UTC (rev 122454)
@@ -33,10 +33,11 @@
*/
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);
}
WebInspector.StylesUISourceCodeProvider.prototype = {
@@ -48,11 +49,8 @@
return this._uiSourceCodes;
},
- _initialize: function()
+ _populate: function()
{
- if (this._initialized)
- return;
-
function populateFrame(frame)
{
for (var i = 0; i < frame.childFrames.length; ++i)
@@ -62,10 +60,8 @@
for (var i = 0; i < resources.length; ++i)
this._resourceAdded({data:resources[i]});
}
- populateFrame.call(this, WebInspector.resourceTreeModel.mainFrame);
- WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
- this._initialized = true;
+ populateFrame.call(this, WebInspector.resourceTreeModel.mainFrame);
},
_resourceAdded: function(event)
@@ -81,6 +77,7 @@
reset: function()
{
this._uiSourceCodes = [];
+ this._populate();
}
}
Modified: trunk/Source/WebCore/inspector/front-end/UISourceCode.js (122453 => 122454)
--- trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2012-07-12 13:44:25 UTC (rev 122453)
+++ trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2012-07-12 14:06:30 UTC (rev 122454)
@@ -185,7 +185,6 @@
if (!window.localStorage)
return;
- WebInspector.Revision._ensureStaleRevisionsFileteredOut();
var registry = WebInspector.Revision._revisionHistoryRegistry();
var historyItems = registry[this.url];
for (var i = 0; historyItems && i < historyItems.length; ++i)
@@ -560,15 +559,11 @@
return WebInspector.Revision._revisionHistoryRegistryObject;
}
-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 = {};
for (var url in registry) {
Modified: trunk/Source/WebCore/inspector/front-end/Workspace.js (122453 => 122454)
--- trunk/Source/WebCore/inspector/front-end/Workspace.js 2012-07-12 13:44:25 UTC (rev 122453)
+++ trunk/Source/WebCore/inspector/front-end/Workspace.js 2012-07-12 14:06:30 UTC (rev 122454)
@@ -130,6 +130,7 @@
new WebInspector.PresentationConsoleMessageHelper(this);
WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._reset, this);
+ WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._reset, this);
}
WebInspector.Workspace.Events = {
@@ -152,6 +153,7 @@
for (var i = 0; i < uiSourceCodeProviders.length; ++i) {
uiSourceCodeProviders[i].reset();
}
+ WebInspector.Revision.filterOutStaleRevisions();
this.dispatchEventToListeners(WebInspector.Workspace.Events.WorkspaceReset, null);
}
}
