Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: Source/WebCore/inspector/front-end/DOMAgent.js

Issue 7147011: Merge 88331 - 2011-06-07 Andrey Kosyakov <caseq@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/inspector/InspectorDOMAgent.cpp ('k') | Source/WebCore/inspector/front-end/ElementsPanel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/inspector/front-end/DOMAgent.js
===================================================================
--- Source/WebCore/inspector/front-end/DOMAgent.js (revision 88781)
+++ Source/WebCore/inspector/front-end/DOMAgent.js (working copy)
@@ -67,8 +67,6 @@
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;
@@ -98,11 +96,6 @@
return this._nodeType;
},
- inShadowTree: function()
- {
- return this._inShadowTree;
- },
-
nodeName: function()
{
return this._nodeName;
@@ -279,17 +272,6 @@
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;
@@ -306,7 +288,6 @@
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;
}
},
@@ -353,8 +334,7 @@
NodeInserted: "NodeInserted",
NodeRemoved: "NodeRemoved",
DocumentUpdated: "DocumentUpdated",
- ChildNodeCountUpdated: "ChildNodeCountUpdated",
- ShadowRootUpdated: "ShadowRootUpdated"
+ ChildNodeCountUpdated: "ChildNodeCountUpdated"
}
WebInspector.DOMAgent.prototype = {
@@ -494,9 +474,6 @@
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);
}
@@ -549,17 +526,6 @@
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);
}
}
@@ -615,10 +581,5 @@
{
if (this._domAgent._searchResultCollector)
this._domAgent._searchResultCollector(nodeIds);
- },
-
- shadowRootUpdated: function(hostId, shadowRoot)
- {
- this._domAgent._shadowRootUpdated(hostId, shadowRoot);
}
}
« no previous file with comments | « Source/WebCore/inspector/InspectorDOMAgent.cpp ('k') | Source/WebCore/inspector/front-end/ElementsPanel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698