DevTools: DOMStorage should notify the view about storage modifications instead of DOMStorageModel

Source/devtools/front_end/DOMStorage.js

Index: Source/devtools/front_end/DOMStorage.js
diff --git a/Source/devtools/front_end/DOMStorage.js b/Source/devtools/front_end/DOMStorage.js
index fc68b6a307f0b46e20e25cd16d21d191fc5e985a..d9df52b98c37621dd3c8cdfe90b93731525a7344 100644
--- a/Source/devtools/front_end/DOMStorage.js
+++ b/Source/devtools/front_end/DOMStorage.js
@@ -29,6 +29,7 @@
 
 /**
  * @constructor
+ * @extends {WebInspector.Object}
  * @param {string} securityOrigin
  * @param {boolean} isLocalStorage
  */
@@ -49,6 +50,13 @@ WebInspector.DOMStorage.storageId = function(securityOrigin, isLocalStorage)
     return { securityOrigin: securityOrigin, isLocalStorage: isLocalStorage };
 }
 
+WebInspector.DOMStorage.Events = {
+    DOMStorageItemsCleared: "DOMStorageItemsCleared",
+    DOMStorageItemRemoved: "DOMStorageItemRemoved",
+    DOMStorageItemAdded: "DOMStorageItemAdded",
+    DOMStorageItemUpdated: "DOMStorageItemUpdated"
+}
+
 WebInspector.DOMStorage.prototype = {
 
     /** @return {DOMStorageAgent.StorageId} */
@@ -102,7 +110,9 @@ WebInspector.DOMStorage.prototype = {
     redo: function()
     {
         this._storageHistory.redo();
-    }
+    },
+
+    __proto__: WebInspector.Object.prototype
 }
 
 /**
@@ -325,14 +335,23 @@ WebInspector.DOMStorageModel = function()
 
 WebInspector.DOMStorageModel.Events = {
     DOMStorageAdded: "DOMStorageAdded",
-    DOMStorageRemoved: "DOMStorageRemoved",
-    DOMStorageItemsCleared: "DOMStorageItemsCleared",
-    DOMStorageItemRemoved: "DOMStorageItemRemoved",
-    DOMStorageItemAdded: "DOMStorageItemAdded",
-    DOMStorageItemUpdated: "DOMStorageItemUpdated"
+    DOMStorageRemoved: "DOMStorageRemoved"
 }
 
 WebInspector.DOMStorageModel.prototype = {
+    /**
+     * @param {DOMStorageAgent.StorageId} storageId
+     * @param {WebInspector.DOMStorage.Event} eventType
+     * @param {Object} eventData
+     */
+    domStorageModified: function(storageId, eventType, eventData)

[pfeldman, 2013/08/23 12:17:51]

This can be private (private things are private to file, not class). Call it
_fireDOMStorageEvent

+    {
+        var domStorage = this.storageForId(storageId);
+        if (!domStorage)
+            return;
+
+        domStorage.dispatchEventToListeners(eventType, eventData);
+    },
 
     /**
      * @param {WebInspector.Event} event
@@ -384,66 +403,6 @@ WebInspector.DOMStorageModel.prototype = {
 
     /**
      * @param {DOMStorageAgent.StorageId} storageId
-     */
-    _domStorageItemsCleared: function(storageId)
-    {
-        var domStorage = this.storageForId(storageId);
-        var storageData = {
-            storage: domStorage
-        };
-        this.dispatchEventToListeners(WebInspector.DOMStorageModel.Events.DOMStorageItemsCleared, storageData);

[pfeldman, 2013/08/23 12:17:51]

It looks like changing this with domStorage.dispatchEventToListeners will
produce smaller diff and achieve similar result.

[vivekg__, 2013/08/23 13:19:37]

Sounds great. Will revert this. Thanks!

-    },
-
-    /**
-     * @param {DOMStorageAgent.StorageId} storageId
-     * @param {string} key
-     */
-    _domStorageItemRemoved: function(storageId, key)
-    {
-        var domStorage = this.storageForId(storageId);
-        var storageData = {
-            storage: domStorage,
-            key: key
-        };
-        this.dispatchEventToListeners(WebInspector.DOMStorageModel.Events.DOMStorageItemRemoved, storageData);
-    },
-
-    /**
-     * @param {DOMStorageAgent.StorageId} storageId
-     * @param {string} key
-     * @param {string} newValue
-     */
-    _domStorageItemAdded: function(storageId, key, newValue)
-    {
-        var domStorage = this.storageForId(storageId);
-        var storageData = {
-            storage: domStorage,
-            key: key,
-            newValue: newValue
-        };
-        this.dispatchEventToListeners(WebInspector.DOMStorageModel.Events.DOMStorageItemAdded, storageData);
-    },
-
-    /**
-     * @param {DOMStorageAgent.StorageId} storageId
-     * @param {string} key
-     * @param {string} oldValue
-     * @param {string} newValue
-     */
-    _domStorageItemUpdated: function(storageId, key, oldValue, newValue)
-    {
-        var domStorage = this.storageForId(storageId);
-        var storageData = {
-            storage: domStorage,
-            key: key,
-            oldValue: oldValue,
-            newValue: newValue
-        };
-        this.dispatchEventToListeners(WebInspector.DOMStorageModel.Events.DOMStorageItemUpdated, storageData);
-    },
-
-    /**
-     * @param {DOMStorageAgent.StorageId} storageId
      * @return {WebInspector.DOMStorage}
      */
     storageForId: function(storageId)
@@ -482,7 +441,9 @@ WebInspector.DOMStorageDispatcher.prototype = {
      */
     domStorageItemsCleared: function(storageId)
     {
-        this._model._domStorageItemsCleared(storageId);
+        var eventType = WebInspector.DOMStorage.Events.DOMStorageItemsCleared;
+        var eventData = {};
+        this._model.domStorageModified(storageId, eventType, eventData);
     },
 
     /**
@@ -491,28 +452,34 @@ WebInspector.DOMStorageDispatcher.prototype = {
      */
     domStorageItemRemoved: function(storageId, key)
     {
-        this._model._domStorageItemRemoved(storageId, key);
+        var eventType = WebInspector.DOMStorage.Events.DOMStorageItemRemoved;
+        var eventData = { key: key };
+        this._model.domStorageModified(storageId, eventType, eventData);
     },
 
     /**
      * @param {DOMStorageAgent.StorageId} storageId
      * @param {string} key
-     * @param {string} newValue
+     * @param {string} value
      */
-    domStorageItemAdded: function(storageId, key, newValue)
+    domStorageItemAdded: function(storageId, key, value)
     {
-        this._model._domStorageItemAdded(storageId, key, newValue);
+        var eventType = WebInspector.DOMStorage.Events.DOMStorageItemAdded;
+        var eventData = { key: key, value: value };
+        this._model.domStorageModified(storageId, eventType, eventData);
     },
 
     /**
      * @param {DOMStorageAgent.StorageId} storageId
      * @param {string} key
      * @param {string} oldValue
-     * @param {string} newValue
+     * @param {string} value
      */
-    domStorageItemUpdated: function(storageId, key, oldValue, newValue)
+    domStorageItemUpdated: function(storageId, key, oldValue, value)
     {
-        this._model._domStorageItemUpdated(storageId, key, oldValue, newValue);
+        var eventType = WebInspector.DOMStorage.Events.DOMStorageItemUpdated;
+        var eventData = { key: key, oldValue: oldValue, value: value };
+        this._model.domStorageModified(storageId, eventType, eventData);
     },
 }