Title: [121956] trunk/Source/WebCore
- Revision
- 121956
- Author
- vse...@chromium.org
- Date
- 2012-07-06 05:19:33 -0700 (Fri, 06 Jul 2012)
Log Message
Web Inspector: Snippets should be correctly (re)loaded when inspector is open and on navigation.
https://bugs.webkit.org/show_bug.cgi?id=90672
Reviewed by Pavel Feldman.
Snippets are now reloaded from the storage on ScriptSnippetMapping reset.
Fixed snippets storage.
* inspector/front-end/ScriptSnippetModel.js:
(WebInspector.ScriptSnippetModel):
(WebInspector.ScriptSnippetModel.prototype._loadSnippets):
(WebInspector.ScriptSnippetModel.prototype._reset):
* inspector/front-end/SnippetStorage.js:
(WebInspector.Snippet.fromObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121955 => 121956)
--- trunk/Source/WebCore/ChangeLog 2012-07-06 12:14:24 UTC (rev 121955)
+++ trunk/Source/WebCore/ChangeLog 2012-07-06 12:19:33 UTC (rev 121956)
@@ -1,5 +1,22 @@
2012-07-06 Vsevolod Vlasov <vse...@chromium.org>
+ Web Inspector: Snippets should be correctly (re)loaded when inspector is open and on navigation.
+ https://bugs.webkit.org/show_bug.cgi?id=90672
+
+ Reviewed by Pavel Feldman.
+
+ Snippets are now reloaded from the storage on ScriptSnippetMapping reset.
+ Fixed snippets storage.
+
+ * inspector/front-end/ScriptSnippetModel.js:
+ (WebInspector.ScriptSnippetModel):
+ (WebInspector.ScriptSnippetModel.prototype._loadSnippets):
+ (WebInspector.ScriptSnippetModel.prototype._reset):
+ * inspector/front-end/SnippetStorage.js:
+ (WebInspector.Snippet.fromObject):
+
+2012-07-06 Vsevolod Vlasov <vse...@chromium.org>
+
Web Inspector: Implement snippets removing.
https://bugs.webkit.org/show_bug.cgi?id=90674
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (121955 => 121956)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-06 12:14:24 UTC (rev 121955)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-06 12:19:33 UTC (rev 121956)
@@ -42,9 +42,7 @@
this._lastSnippetEvaluationIndexSetting = WebInspector.settings.createSetting("lastSnippetEvaluationIndex", 0);
this._snippetScriptMapping = new WebInspector.SnippetScriptMapping(this);
- var snippets = this._snippetStorage.snippets;
- for (var i = 0; i < snippets.length; ++i)
- this._addScriptSnippet(snippets[i]);
+ this._loadSnippets();
}
WebInspector.ScriptSnippetModel.snippetSourceURLPrefix = "snippets:///";
@@ -58,6 +56,13 @@
return this._snippetScriptMapping;
},
+ _loadSnippets: function()
+ {
+ var snippets = this._snippetStorage.snippets();
+ for (var i = 0; i < snippets.length; ++i)
+ this._addScriptSnippet(snippets[i]);
+ },
+
/**
* @return {WebInspector.SnippetJavaScriptSource}
*/
@@ -362,6 +367,7 @@
var removedUISourceCodes = this._releasedUISourceCodes();
this._uiSourceCodeForScriptId = {};
this._scriptForUISourceCode = new Map();
+ this._loadSnippets();
}
}
Modified: trunk/Source/WebCore/inspector/front-end/SnippetStorage.js (121955 => 121956)
--- trunk/Source/WebCore/inspector/front-end/SnippetStorage.js 2012-07-06 12:14:24 UTC (rev 121955)
+++ trunk/Source/WebCore/inspector/front-end/SnippetStorage.js 2012-07-06 12:19:33 UTC (rev 121956)
@@ -81,7 +81,7 @@
{
var savedSnippets = this._snippetsSetting.get();
for (var i = 0; i < savedSnippets.length; ++i)
- this._snippetAdded(WebInspector.Snippet.fromObject(savedSnippets[i]));
+ this._snippetAdded(WebInspector.Snippet.fromObject(this, savedSnippets[i]));
},
/**
@@ -142,12 +142,13 @@
}
/**
+ * @param {WebInspector.SnippetStorage} storage
* @param {Object} serializedSnippet
* @return {WebInspector.Snippet}
*/
-WebInspector.Snippet.fromObject = function(serializedSnippet)
+WebInspector.Snippet.fromObject = function(storage, serializedSnippet)
{
- return new WebInspector.Snippet(this, serializedSnippet.id, serializedSnippet.name, serializedSnippet.content);
+ return new WebInspector.Snippet(storage, serializedSnippet.id, serializedSnippet.name, serializedSnippet.content);
}
WebInspector.Snippet.prototype = {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
