Revert 142161 "Web Inspector: CPU pegged when inspecting LocalSt..."

Source/WebCore/inspector/front-end/DOMStorageItemsView.js

 /*
  * Copyright (C) 2008 Nokia Inc.  All rights reserved.
- * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.View}
  */
-WebInspector.DOMStorageItemsView = function(domStorage, domStorageModel)
+WebInspector.DOMStorageItemsView = function(domStorage)
 {
     WebInspector.View.call(this);
 
     this.domStorage = domStorage;
-    this.domStorageModel = domStorageModel;
 
     this.element.addStyleClass("storage-view");
     this.element.addStyleClass("table");
 
     this.deleteButton = new WebInspector.StatusBarButton(WebInspector.UIString("Delete"), "delete-storage-status-bar-item");
     this.deleteButton.visible = false;
     this.deleteButton.addEventListener("click", this._deleteButtonClicked, this);
 
     this.refreshButton = new WebInspector.StatusBarButton(WebInspector.UIString("Refresh"), "refresh-storage-status-bar-item");
     this.refreshButton.addEventListener("click", this._refreshButtonClicked, this);
-
-    this.domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageItemsCleared, this._domStorageItemsCleared, this);
-    this.domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageItemRemoved, this._domStorageItemRemoved, this);
-    this.domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageItemAdded, this._domStorageItemAdded, this);
-    this.domStorageModel.addEventListener(WebInspector.DOMStorageModel.Events.DOMStorageItemUpdated, this._domStorageItemUpdated, this);
 }
 
 WebInspector.DOMStorageItemsView.prototype = {
     get statusBarItems()
     {
         return [this.refreshButton.element, this.deleteButton.element];
     },
 
     wasShown: function()
     {
-        this._update();
+        this.update();
     },
 
     willHide: function()
     {
         this.deleteButton.visible = false;
     },
 
-    /**
-     * @param {WebInspector.Event} event
-     */
-    _domStorageItemsCleared: function(event)
-    {
-        if (!this.isShowing())
-            return;
-
-        this._dataGrid.rootNode().removeChildren();
-        this._dataGrid.addCreationNode(false);
-        this.deleteButton.visible = false;
-        event.consume(true);
-    },
-
-    /**
-     * @param {WebInspector.Event} event
-     */
-    _domStorageItemRemoved: function(event)
-    {
-        if (!this.isShowing())
-            return;
-
-        var storageData = event.data;
-        var rootNode = this._dataGrid.rootNode();
-        var children = rootNode.children;
-
-        event.consume(true);
-
-        for (var i = 0; i < children.length; ++i) {
-            var childNode = children[i];
-            if (childNode.data.key === storageData.key) {
-                rootNode.removeChild(childNode);
-                this.deleteButton.visible = (children.length > 1);
-                return;
-            }
-        }
-    },
-
-    /**
-     * @param {WebInspector.Event} event
-     */
-    _domStorageItemAdded: function(event)
-    {
-        if (!this.isShowing())
-            return;
-
-        var storageData = event.data;
-        var rootNode = this._dataGrid.rootNode();
-        var children = rootNode.children;
-
-        event.consume(true);
-        this.deleteButton.visible = true;
-
-        for (var i = 0; i < children.length; ++i)
-            if (children[i].data.key === storageData.key)
-                return;
-
-        var childNode = new WebInspector.DataGridNode({key: storageData.key, value: storageData.newValue}, false);
-        rootNode.insertChild(childNode, children.length - 1);
-    },
-
-    /**
-     * @param {WebInspector.Event} event
-     */
-    _domStorageItemUpdated: function(event)
-    {
-        if (!this.isShowing())
-            return;
-
-        var storageData = event.data;
-        var rootNode = this._dataGrid.rootNode();
-        var children = rootNode.children;
-
-        event.consume(true);
-
-        for (var i = 0; i < children.length; ++i) {
-            var childNode = children[i];
-            if (childNode.data.key === storageData.key) {
-                childNode.data.value = storageData.newValue;
-                childNode.refresh();
-                this.deleteButton.visible = true;
-                return;
-            }
-        }
-    },
-
-    _update: function()
+    update: function()
     {
         this.detachChildViews();
         this.domStorage.getEntries(this._showDOMStorageEntries.bind(this));
     },
 
     _showDOMStorageEntries: function(error, entries)
     {
         if (error)
             return;
 
         this._dataGrid = this._dataGridForDOMStorageEntries(entries);
         this._dataGrid.show(this.element);
         this._dataGrid.autoSizeColumns(10);
-        this.deleteButton.visible = (this._dataGrid.rootNode().children.length > 1);
+        this.deleteButton.visible = true;
     },
 
     _dataGridForDOMStorageEntries: function(entries)
     {
         var columns = {key: {}, value: {}};
 
         columns.key.title = WebInspector.UIString("Key");
         columns.key.editable = true;
 
         columns.value.title = WebInspector.UIString("Value");
@@ skipping 25 matching lines @@
     _deleteButtonClicked: function(event)
     {
         if (!this._dataGrid || !this._dataGrid.selectedNode)
             return;
 
         this._deleteCallback(this._dataGrid.selectedNode);
     },
 
     _refreshButtonClicked: function(event)
     {
-        this._update();
+        this.update();
     },
 
     _editingCallback: function(editingNode, columnIdentifier, oldText, newText)
     {
         var domStorage = this.domStorage;
         if ("key" === columnIdentifier) {
             if (oldText)
                 domStorage.removeItem(oldText);
 
             domStorage.setItem(newText, editingNode.data.value);
-        } else
+        } else {
             domStorage.setItem(editingNode.data.key, newText);
+        }
+
+        this.update();
     },
 
     _deleteCallback: function(node)
     {
         if (!node || node.isCreationNode)
             return;
 
         if (this.domStorage)
             this.domStorage.removeItem(node.data.key);
+
+        this.update();
     },
 
     __proto__: WebInspector.View.prototype
 }