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

Source/WebCore/inspector/front-end/ElementsTreeOutline.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 282 matching lines @@
 
         return populated;
     }
 }
 
 WebInspector.ElementsTreeOutline.prototype.__proto__ = TreeOutline.prototype;
 
 WebInspector.ElementsTreeElement = function(node, elementCloseTag)
 {
     this._elementCloseTag = elementCloseTag;
-    var hasChildrenOverride = !elementCloseTag && (node.hasChildNodes() || node.shadowRoot) && !this._showInlineText(node);
+    var hasChildrenOverride = !elementCloseTag && node.hasChildNodes() && !this._showInlineText(node);
 
     // The title will be updated in onattach.
     TreeElement.call(this, "", node, hasChildrenOverride);
 
     if (this.representedObject.nodeType() == Node.ELEMENT_NODE && !elementCloseTag)
         this._canAddAttributes = true;
     this._searchQuery = null;
     this._expandedChildrenLimit = WebInspector.ElementsTreeElement.InitialChildrenLimit;
 }
 
@@ skipping 288 matching lines @@
                                 elementToSelect = newElement;
                             if (treeElement.expandedChildCount > treeElement.expandedChildrenLimit)
                                 treeElement.expandedChildrenLimit++;
                         }
                     }
                 }
 
                 child = child.nextSibling;
                 ++treeChildIndex;
             }
-            // If we ever had shadow root child, it's going to be second to last (before closing tag)
-            var shadowRootChild = treeElement.children[treeElement.children.length - 2];
-            if (shadowRootChild && shadowRootChild.representedObject.nodeType() === Node.SHADOW_ROOT_NODE) {
-            if (!node.shadowRoot)
-                treeElement.removeChild(shadowRootChild);
-            else
-                treeElement.representedObject = node.shadowRoot;
-            } else if (node.shadowRoot)
-                treeElement.insertChildElement(node.shadowRoot, treeChildIndex);
         }
 
         // Remove any tree elements that no longer have this node (or this node's contentDocument) as their parent.
         for (var i = (this.children.length - 1); i >= 0; --i) {
             var currentChild = this.children[i];
             var currentNode = currentChild.representedObject;
             var currentParentNode = currentNode.parentNode;
 
             if (currentParentNode === this.representedObject)
                 continue;
@@ skipping 624 matching lines @@
         } else {
             value = value.escapeHTML().replace(/([\/;:\)\]\}])/g, "$1\u200B");
             var attrValueElement = attrSpanElement.createChild("span", "webkit-html-attribute-value");
             attrValueElement.textContent = value;
         }
 
         if (hasText)
             attrSpanElement.appendChild(document.createTextNode("\""));
     },
 
-    _buildTagDOM: function(parentElement, tagName, isClosingTag, isDistinctTreeElement, linkify, isShadow)
+    _buildTagDOM: function(parentElement, tagName, isClosingTag, isDistinctTreeElement, linkify)
     {
         var node = this.representedObject;
         var classes = [ "webkit-html-tag" ];
         if (isClosingTag && isDistinctTreeElement)
             classes.push("close");
-        if (isShadow)
-            classes.push("shadow");
         var tagElement = parentElement.createChild("span", classes.join(" "));
         tagElement.appendChild(document.createTextNode("<"));
         var tagNameElement = tagElement.createChild("span", isClosingTag ? "" : "webkit-html-tag-name");
         tagNameElement.textContent = (isClosingTag ? "/" : "") + tagName;
-
         if (!isClosingTag && node.hasAttributes()) {
             var attributes = node.attributes();
             for (var i = 0; i < attributes.length; ++i) {
                 var attr = attributes[i];
                 tagElement.appendChild(document.createTextNode(" "));
                 this._buildAttributeDOM(tagElement, attr.name, attr.value, node, linkify);
             }
         }
         tagElement.appendChild(document.createTextNode(">"));
         parentElement.appendChild(document.createTextNode("\u200B"));
@@ skipping 14 matching lines @@
                 break;
 
             case Node.ATTRIBUTE_NODE:
                 var value = node.value || "\u200B"; // Zero width space to force showing an empty value.
                 this._buildAttributeDOM(info.titleDOM, node.name, value);
                 break;
 
             case Node.ELEMENT_NODE:
                 var tagName = this.treeOutline.nodeNameToCorrectCase(node.nodeName()).escapeHTML();
                 if (this._elementCloseTag) {
-                    this._buildTagDOM(info.titleDOM, tagName, true, true, false, node.inShadowTree());
+                    this._buildTagDOM(info.titleDOM, tagName, true, true);
                     info.hasChildren = false;
                     break;
                 }
 
-                this._buildTagDOM(info.titleDOM, tagName, false, false, linkify, node.inShadowTree());
+                this._buildTagDOM(info.titleDOM, tagName, false, false, linkify);
 
                 var textChild = this._singleTextChild(node);
                 var showInlineText = textChild && textChild.nodeValue().length < Preferences.maxInlineTextChildLength;
 
                 if (!this.expanded && (!showInlineText && (this.treeOutline.isXMLMimeType || !WebInspector.ElementsTreeElement.ForbiddenClosingTagElements[tagName]))) {
                     if (this.hasChildren) {
                         var textNodeElement = info.titleDOM.createChild("span", "webkit-html-text-node");
                         textNodeElement.textContent = "\u2026";
                         info.titleDOM.appendChild(document.createTextNode("\u200B"));
                     }
-                    this._buildTagDOM(info.titleDOM, tagName, true, false, false, node.inShadowTree());
+                    this._buildTagDOM(info.titleDOM, tagName, true, false, false);
                 }
 
                 // If this element only has a single child that is a text node,
                 // just show that text and the closing tag inline rather than
                 // create a subtree for them
                 if (showInlineText) {
                     var textNodeElement = info.titleDOM.createChild("span", "webkit-html-text-node");
                     textNodeElement.textContent = textChild.nodeValue().escapeHTML();
                     info.titleDOM.appendChild(document.createTextNode("\u200B"));
-                    this._buildTagDOM(info.titleDOM, tagName, true, false, node.inShadowTree());
+                    this._buildTagDOM(info.titleDOM, tagName, true, false);
                     info.hasChildren = false;
                 }
                 break;
 
             case Node.TEXT_NODE:
                 if (isNodeWhitespace.call(node))
                     info.titleDOM.appendChild(document.createTextNode("(whitespace)"));
                 else {
                     if (node.parentNode && node.parentNode.nodeName().toLowerCase() === "script") {
                         var newNode = info.titleDOM.createChild("span", "webkit-html-text-node webkit-html-js-node");
@@ skipping 34 matching lines @@
                 if (node.internalSubset)
                     docTypeElement.appendChild(document.createTextNode(" [" + node.internalSubset + "]"));
 
                 docTypeElement.appendChild(document.createTextNode(">"));
                 break;
 
             case Node.CDATA_SECTION_NODE:
                 var cdataElement = info.titleDOM.createChild("span", "webkit-html-text-node");
                 cdataElement.appendChild(document.createTextNode("<![CDATA[" + node.nodeValue().escapeHTML() + "]]>"));
                 break;
-
-            case Node.SHADOW_ROOT_NODE:
-                var cdataElement = info.titleDOM.createChild("span", "dom-shadow-root");
-                cdataElement.appendChild(document.createTextNode("(shadow)"));
-                break;
-
             default:
                 var defaultElement = info.titleDOM.appendChild(document.createTextNode(this.treeOutline.nodeNameToCorrectCase(node.nodeName()).collapseWhitespace().escapeHTML()));
         }
 
         return info;
     },
 
     _singleTextChild: function(node)
     {
-        if (!node || node.shadowRoot)
+        if (!node)
             return null;
 
         var firstChild = node.firstChild;
         if (!firstChild || firstChild.nodeType() !== Node.TEXT_NODE)
             return null;
 
         var sibling = firstChild.nextSibling;
         return sibling ? null : firstChild;
     },
 
@@ skipping 84 matching lines @@
         // Fall back for XPath, etc. matches.
         if (!matchRanges.length)
             matchRanges.push({ offset: 0, length: text.length });
 
         this._highlightResult = [];
         highlightSearchResults(this.listItemElement, matchRanges, this._highlightResult);
     }
 }
 
 WebInspector.ElementsTreeElement.prototype.__proto__ = TreeElement.prototype;