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

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

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 49 matching lines @@
     this._matchedCSSRules = [];
 
     if (this._nodeType === Node.ELEMENT_NODE) {
         // HTML and BODY from internal iframes should not overwrite top-level ones.
         if (!this.ownerDocument.documentElement && this._nodeName === "HTML")
             this.ownerDocument.documentElement = this;
         if (!this.ownerDocument.body && this._nodeName === "BODY")
             this.ownerDocument.body = this;
         if (payload.documentURL)
             this.documentURL = payload.documentURL;
-        if (payload.shadowRoot)
-            this._setShadowRootPayload(payload.shadowRoot);
     } else if (this._nodeType === Node.DOCUMENT_TYPE_NODE) {
         this.publicId = payload.publicId;
         this.systemId = payload.systemId;
         this.internalSubset = payload.internalSubset;
     } else if (this._nodeType === Node.DOCUMENT_NODE) {
         this.documentURL = payload.documentURL;
         this.xmlVersion = payload.xmlVersion;
     } else if (this._nodeType === Node.ATTRIBUTE_NODE) {
         this.name = payload.name;
         this.value = payload.value;
     }
 }
 
 WebInspector.DOMNode.prototype = {
     hasAttributes: function()
     {
         return this._attributes.length > 0;
     },
 
     hasChildNodes: function()
     {
         return this._childNodeCount > 0;
     },
 
     nodeType: function()
     {
         return this._nodeType;
     },
 
-    inShadowTree: function()
-    {
-        return this._inShadowTree;
-    },
-
     nodeName: function()
     {
         return this._nodeName;
     },
 
     setNodeName: function(name, callback)
     {
         DOMAgent.setNodeName(this.id, name, callback);
     },
 
@@ skipping 156 matching lines @@
     {
         this.children = [];
         for (var i = 0; i < payloads.length; ++i) {
             var payload = payloads[i];
             var node = new WebInspector.DOMNode(this.ownerDocument, payload);
             this.children.push(node);
         }
         this._renumber();
     },
 
-    _setShadowRootPayload: function(payload)
-    {
-        if (!payload) {
-            this.shadowRoot = null;
-            return;
-        }
-        this.shadowRoot = new WebInspector.DOMNode(this.ownerDocument, payload);
-        this.shadowRoot.parentNode = this;
-        this.shadowRoot._inShadowTree = true;
-    },
-
     _renumber: function()
     {
         this._childNodeCount = this.children.length;
         if (this._childNodeCount == 0) {
             this.firstChild = null;
             this.lastChild = null;
             return;
         }
         this.firstChild = this.children[0];
         this.lastChild = this.children[this._childNodeCount - 1];
         for (var i = 0; i < this._childNodeCount; ++i) {
             var child = this.children[i];
             child.index = i;
             child.nextSibling = i + 1 < this._childNodeCount ? this.children[i + 1] : null;
             child.prevSibling = i - 1 >= 0 ? this.children[i - 1] : null;
             child.parentNode = this;
-            child._inShadowTree = this._inShadowTree;
         }
     },
 
     _addAttribute: function(name, value)
     {
         var attr = {
             "name": name,
             "value": value,
             "_node": this
         };
@@ skipping 26 matching lines @@
     this._document = null;
     InspectorBackend.registerDomainDispatcher("DOM", new WebInspector.DOMDispatcher(this));
 }
 
 WebInspector.DOMAgent.Events = {
     AttrModified: "AttrModified",
     CharacterDataModified: "CharacterDataModified",
     NodeInserted: "NodeInserted",
     NodeRemoved: "NodeRemoved",
     DocumentUpdated: "DocumentUpdated",
-    ChildNodeCountUpdated: "ChildNodeCountUpdated",
-    ShadowRootUpdated: "ShadowRootUpdated"
+    ChildNodeCountUpdated: "ChildNodeCountUpdated"
 }
 
 WebInspector.DOMAgent.prototype = {
     requestDocument: function(callback)
     {
         if (this._document) {
             if (callback)
                 callback(this._document);
             return;
         }
@@ skipping 119 matching lines @@
         var parent = this._idToDOMNode[parentId];
         parent._setChildrenPayload(payloads);
         this._bindNodes(parent.children);
     },
 
     _bindNodes: function(children)
     {
         for (var i = 0; i < children.length; ++i) {
             var child = children[i];
             this._idToDOMNode[child.id] = child;
-            if (child.shadowRoot)
-                this._idToDOMNode[child.shadowRoot.id] = child.shadowRoot;
-
             if (child.children)
                 this._bindNodes(child.children);
         }
     },
 
     _childNodeCountUpdated: function(nodeId, newValue)
     {
         var node = this._idToDOMNode[nodeId];
         node._childNodeCount = newValue;
         this.dispatchEventToListeners(WebInspector.DOMAgent.Events.ChildNodeCountUpdated, node);
@@ skipping 32 matching lines @@
     },
 
     querySelector: function(nodeId, selectors, callback)
     {
         DOMAgent.querySelector(nodeId, selectors, this._wrapClientCallback(callback));
     },
 
     querySelectorAll: function(nodeId, selectors, callback)
     {
         DOMAgent.querySelectorAll(nodeId, selectors, this._wrapClientCallback(callback));
-    },
-
-    _shadowRootUpdated: function(hostId, payload)
-    {
-        var host = this._idToDOMNode[hostId];
-        if (host.shadowRoot && !payload)
-            delete this._idToDOMNode[host.shadowRoot.id];
-        host._setShadowRootPayload(payload);
-        if (host.shadowRoot)
-            this._idToDOMNode[host.shadowRoot.id] = host.shadowRoot;
-        this.dispatchEventToListeners(WebInspector.DOMAgent.Events.ShadowRootUpdated, host);
     }
 }
 
 WebInspector.DOMAgent.prototype.__proto__ = WebInspector.Object.prototype;
 
 WebInspector.DOMDispatcher = function(domAgent)
 {
     this._domAgent = domAgent;
 }
 
@@ skipping 35 matching lines @@
 
     inspectElementRequested: function(nodeId)
     {
         WebInspector.updateFocusedNode(nodeId);
     },
 
     searchResults: function(nodeIds)
     {
         if (this._domAgent._searchResultCollector)
             this._domAgent._searchResultCollector(nodeIds);
-    },
-
-    shadowRootUpdated: function(hostId, shadowRoot)
-    {
-        this._domAgent._shadowRootUpdated(hostId, shadowRoot);
     }
 }