Merge 88331 - 2011-06-07 Andrey Kosyakov <caseq@chromium.org>

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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
@@ skipping 95 matching lines @@
 
     this._nodeSearchButton = new WebInspector.StatusBarButton(WebInspector.UIString("Select an element in the page to inspect it."), "node-search-status-bar-item");
     this._nodeSearchButton.addEventListener("click", this.toggleSearchingForNode.bind(this), false);
 
     this.element.appendChild(this.contentElement);
     this.element.appendChild(this.sidebarElement);
     this.element.appendChild(this.sidebarResizeElement);
 
     this._registerShortcuts();
 
-    WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.NodeInserted, this._nodeUpdated.bind(this, true));
+    WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.NodeInserted, this._nodeInserted, this);
     WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.NodeRemoved, this._nodeRemoved, this);
     WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.AttrModified, this._attributesUpdated, this);
-    WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.CharacterDataModified, this._nodeUpdated.bind(this, false));
+    WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.CharacterDataModified, this._characterDataModified, this);
     WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.DocumentUpdated, this._documentUpdated, this);
     WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.ChildNodeCountUpdated, this._childNodeCountUpdated, this);
-    WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.ShadowRootUpdated, this._nodeUpdated.bind(this, true));
 
     this.recentlyModifiedNodes = [];
 }
 
 WebInspector.ElementsPanel.prototype = {
     get toolbarItemLabel()
     {
         return WebInspector.UIString("Elements");
     },
 
@@ skipping 292 matching lines @@
     startEditingStyle: function()
     {
         this._isEditingStyle = true;
     },
 
     endEditingStyle: function()
     {
         delete this._isEditingStyle;
     },
 
-    _nodeUpdated: function(hierarchyUpdated, event)
-    {
-        var updatedNodeDetails = { node: event.data };
-        if (hierarchyUpdated)
-            updatedNodeDetails.parent = event.data.parentNode;
-        this.recentlyModifiedNodes.push(updatedNodeDetails);
-        if (this.visible)
-            this._updateModifiedNodesSoon();
-    },
-
     _attributesUpdated: function(event)
     {
-        this._nodeUpdated(false, event);
+        this.recentlyModifiedNodes.push({node: event.data, updated: true});
+        if (this.visible)
+            this._updateModifiedNodesSoon();
 
         if (!this._isEditingStyle && event.data === this.focusedDOMNode)
             this._styleSheetChanged();
     },
 
-    _nodeRemoved: function(event)
+    _characterDataModified: function(event)
     {
-        this.recentlyModifiedNodes.push({node: event.data.node, parent: event.data.parent});
+        this.recentlyModifiedNodes.push({node: event.data, updated: true});
         if (this.visible)
             this._updateModifiedNodesSoon();
     },
+
+    _nodeInserted: function(event)
+    {
+        this.recentlyModifiedNodes.push({node: event.data, parent: event.data.parentNode, inserted: true});
+        if (this.visible)
+            this._updateModifiedNodesSoon();
+    },
+
+    _nodeRemoved: function(event)
+    {
+        this.recentlyModifiedNodes.push({node: event.data.node, parent: event.data.parent, removed: true});
+        if (this.visible)
+            this._updateModifiedNodesSoon();
+    },
 
     _childNodeCountUpdated: function(event)
     {
         var treeElement = this.treeOutline.findTreeElement(event.data);
         if (treeElement)
             treeElement.hasChildren = event.data.hasChildNodes();
     },
 
     _updateModifiedNodesSoon: function()
     {
         if ("_updateModifiedNodesTimeout" in this)
             return;
         this._updateModifiedNodesTimeout = setTimeout(this.updateModifiedNodes.bind(this), 0);
     },
 
     updateModifiedNodes: function()
     {
         if ("_updateModifiedNodesTimeout" in this) {
             clearTimeout(this._updateModifiedNodesTimeout);
             delete this._updateModifiedNodesTimeout;
         }
 
         var updatedParentTreeElements = [];
         var updateBreadcrumbs = false;
 
         for (var i = 0; i < this.recentlyModifiedNodes.length; ++i) {
             var parent = this.recentlyModifiedNodes[i].parent;
             var node = this.recentlyModifiedNodes[i].node;
 
-            if (!parent) {
+            if (this.recentlyModifiedNodes[i].updated) {
                 var nodeItem = this.treeOutline.findTreeElement(node);
                 if (nodeItem)
                     nodeItem.updateTitle();
                 continue;
             }
 
+            if (!parent)
+                continue;
+
             var parentNodeItem = this.treeOutline.findTreeElement(parent);
             if (parentNodeItem && !parentNodeItem.alreadyUpdatedChildren) {
                 parentNodeItem.updateChildren();
                 parentNodeItem.alreadyUpdatedChildren = true;
                 updatedParentTreeElements.push(parentNodeItem);
             }
 
             if (!updateBreadcrumbs && (this.focusedDOMNode === parent || isAncestorNode(this.focusedDOMNode, parent)))
                 updateBreadcrumbs = true;
         }
@@ skipping 149 matching lines @@
                     break
 
                 case Node.COMMENT_NODE:
                     crumbTitle = "<!-->";
                     break;
 
                 case Node.DOCUMENT_TYPE_NODE:
                     crumbTitle = "<!DOCTYPE>";
                     break;
 
-                case Node.SHADOW_ROOT_NODE:
-                    crumbTitle = "(shadow)";
-                    break;
-
                 default:
                     crumbTitle = this.treeOutline.nodeNameToCorrectCase(current.nodeName());
             }
 
             if (!crumb.childNodes.length) {
                 var nameElement = document.createElement("span");
                 nameElement.textContent = crumbTitle;
                 crumb.appendChild(nameElement);
                 crumb.title = crumbTitle;
             }
@@ skipping 469 matching lines @@
         this.setSearchingForNode(!this._nodeSearchButton.toggled);
     },
 
     elementsToRestoreScrollPositionsFor: function()
     {
         return [ this.contentElement, this.sidebarElement ];
     }
 }
 
 WebInspector.ElementsPanel.prototype.__proto__ = WebInspector.Panel.prototype;