Changeset 121956 in webkit

Timestamp:

Jul 6, 2012 5:19:33 AM (12 years ago)

Author:

vsevik@chromium.org

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ScriptSnippetModel.js (modified) (3 diffs)
• inspector/front-end/SnippetStorage.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-06  Vsevolod Vlasov  <vsevik@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  <vsevik@chromium.org>
 

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

@@ -43 +43 @@
     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();
 }
 
@@ -57 +55 @@
     {
         return this._snippetScriptMapping;
+    },
+
+    _loadSnippets: function()
+    {
+        var snippets = this._snippetStorage.snippets();
+        for (var i = 0; i < snippets.length; ++i)
+            this._addScriptSnippet(snippets[i]);
     },
 
@@ -363 +368 @@
         this._uiSourceCodeForScriptId = {};
         this._scriptForUISourceCode = new Map();
+        this._loadSnippets();
     }
 }

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

@@ -82 +82 @@
         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]));
     },
 
@@ -143 +143 @@
 
 /**
+ * @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);
 }