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

Source/WebCore/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 57 matching lines @@
 #include "InspectorState.h"
 #include "InstrumentingAgents.h"
 #include "MutationEvent.h"
 #include "Node.h"
 #include "NodeList.h"
 #include "Page.h"
 #include "Pasteboard.h"
 #include "RenderStyle.h"
 #include "RenderStyleConstants.h"
 #include "ScriptEventListener.h"
-#include "ShadowRoot.h"
 #include "StyleSheetList.h"
 #include "Text.h"
 
 #if ENABLE(XPATH)
 #include "XPathResult.h"
 #endif
 
 #include "markup.h"
 
 #include <wtf/text/CString.h>
@@ skipping 355 matching lines @@
     RefPtr<Document> doc = m_document;
     reset();
     m_document = doc;
 
     *root = buildObjectForNode(m_document.get(), 2, &m_documentNodeToIdMap);
 }
 
 void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId)
 {
     Node* node = nodeForId(nodeId);
-    if (!node || !isContainerNode(*node))
+    if (!node || (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE && node->nodeType() != Node::DOCUMENT_FRAGMENT_NODE))
         return;
     if (m_childrenRequested.contains(nodeId))
         return;
 
     NodeToIdMap* nodeMap = m_idToNodesMap.get(nodeId);
     RefPtr<InspectorArray> children = buildArrayForContainerChildren(node, 1, nodeMap);
     m_frontend->setChildNodes(nodeId, children.release());
 }
 
 void InspectorDOMAgent::discardBindings()
@@ skipping 586 matching lines @@
 
     switch (node->nodeType()) {
         case Node::TEXT_NODE:
         case Node::COMMENT_NODE:
         case Node::CDATA_SECTION_NODE:
             nodeValue = node->nodeValue();
             break;
         case Node::ATTRIBUTE_NODE:
             localName = node->localName();
             break;
-        case Node::SHADOW_ROOT_NODE:
         case Node::DOCUMENT_FRAGMENT_NODE:
             break;
         case Node::DOCUMENT_NODE:
         case Node::ELEMENT_NODE:
         default:
             nodeName = node->nodeName();
             localName = node->localName();
             break;
     }
 
     value->setNumber("id", id);
     value->setNumber("nodeType", node->nodeType());
     value->setString("nodeName", nodeName);
     value->setString("localName", localName);
     value->setString("nodeValue", nodeValue);
 
-    if (isContainerNode(*node)) {
+    if (node->nodeType() == Node::ELEMENT_NODE || node->nodeType() == Node::DOCUMENT_NODE || node->nodeType() == Node::DOCUMENT_FRAGMENT_NODE) {
         int nodeCount = innerChildNodeCount(node);
         value->setNumber("childNodeCount", nodeCount);
         RefPtr<InspectorArray> children = buildArrayForContainerChildren(node, depth, nodesMap);
         if (children->length() > 0)
             value->setArray("children", children.release());
 
         if (node->nodeType() == Node::ELEMENT_NODE) {
             Element* element = static_cast<Element*>(node);
             value->setArray("attributes", buildArrayForElementAttributes(element));
             if (node->isFrameOwnerElement()) {
                 HTMLFrameOwnerElement* frameOwner = static_cast<HTMLFrameOwnerElement*>(node);
                 value->setString("documentURL", documentURLString(frameOwner->contentDocument()));
             }
-            if (ShadowRoot* shadowRoot = element->shadowRoot())
-                value->setObject("shadowRoot", buildObjectForNode(shadowRoot, depth, nodesMap));
         } else if (node->nodeType() == Node::DOCUMENT_NODE) {
             Document* document = static_cast<Document*>(node);
             value->setString("documentURL", documentURLString(document));
             value->setString("xmlVersion", document->xmlVersion());
         }
     } else if (node->nodeType() == Node::DOCUMENT_TYPE_NODE) {
         DocumentType* docType = static_cast<DocumentType*>(node);
         value->setString("publicId", docType->publicId());
         value->setString("systemId", docType->systemId());
         value->setString("internalSubset", docType->internalSubset());
@@ skipping 152 matching lines @@
 }
 
 void InspectorDOMAgent::didInsertDOMNode(Node* node)
 {
     if (isWhitespace(node))
         return;
 
     // We could be attaching existing subtree. Forget the bindings.
     unbind(node, &m_documentNodeToIdMap);
 
-    ContainerNode* parent = node->isShadowRoot() ? node->shadowHost() : node->parentNode();
+    ContainerNode* parent = node->parentNode();
     int parentId = m_documentNodeToIdMap.get(parent);
     // Return if parent is not mapped yet.
     if (!parentId)
         return;
 
-    if (node->isShadowRoot()) {
-        RefPtr<InspectorObject> value = buildObjectForNode(node, 0, &m_documentNodeToIdMap);
-        m_frontend->shadowRootUpdated(parentId, value.release());
-        return;
-    }
     if (!m_childrenRequested.contains(parentId)) {
         // No children are mapped yet -> only notify on changes of hasChildren.
         m_frontend->childNodeCountUpdated(parentId, innerChildNodeCount(parent));
     } else {
         // Children have been requested -> return value of a new child.
         Node* prevSibling = innerPreviousSibling(node);
         int prevId = prevSibling ? m_documentNodeToIdMap.get(prevSibling) : 0;
         RefPtr<InspectorObject> value = buildObjectForNode(node, 0, &m_documentNodeToIdMap);
         m_frontend->childNodeInserted(parentId, prevId, value.release());
     }
 }
 
 void InspectorDOMAgent::didRemoveDOMNode(Node* node)
 {
     if (isWhitespace(node))
         return;
 
-    ContainerNode* parent = node->isShadowRoot() ? node->shadowHost() : node->parentNode();
+    ContainerNode* parent = node->parentNode();
     int parentId = m_documentNodeToIdMap.get(parent);
     // If parent is not mapped yet -> ignore the event.
     if (!parentId)
         return;
 
     if (m_domListener)
         m_domListener->didRemoveDOMNode(node);
 
-    if (node->isShadowRoot())
-        m_frontend->shadowRootUpdated(parentId, 0);
-    else if (!m_childrenRequested.contains(parentId)) {
+    if (!m_childrenRequested.contains(parentId)) {
         // No children are mapped yet -> only notify on changes of hasChildren.
         if (innerChildNodeCount(parent) == 1)
             m_frontend->childNodeCountUpdated(parentId, 0);
     } else
         m_frontend->childNodeRemoved(parentId, m_documentNodeToIdMap.get(node));
     unbind(node, &m_documentNodeToIdMap);
 }
 
 void InspectorDOMAgent::didModifyDOMAttr(Element* element)
 {
@@ skipping 128 matching lines @@
         mode = DOMNodeHighlighter::HighlightContent;
     else if (m_highlightMode == "padding")
         mode = DOMNodeHighlighter::HighlightPadding;
     else if (m_highlightMode == "border")
         mode = DOMNodeHighlighter::HighlightBorder;
     else if (m_highlightMode == "margin")
         mode = DOMNodeHighlighter::HighlightMargin;
     DOMNodeHighlighter::DrawNodeHighlight(context, m_highlightedNode.get(), mode);
 }
 
-bool InspectorDOMAgent::isContainerNode(const Node& node)
-{
-     Node::NodeType type = node.nodeType();
-     return type == Node::ELEMENT_NODE
-         || type == Node::DOCUMENT_NODE
-         || type == Node::DOCUMENT_FRAGMENT_NODE
-         || type == Node::SHADOW_ROOT_NODE;
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)