Changeset 108770 in webkit

Timestamp:

Feb 24, 2012 4:02:11 AM (12 years ago)

Author:

hayato@chromium.org

Message:

Make Node::showTreeForThis (and Node::showTreeForThisAcrossFrame) dump multiple shadow roots.
​https://bugs.webkit.org/show_bug.cgi?id=79351

Reviewed by Dimitri Glazkov.

No new tests since these utility functions are only available in debug build.
I manually tested in GDB session.

• dom/Node.cpp:

(WebCore::oldestShadowRootFor):
(WebCore::traverseTreeAndMark):
(WebCore::parentOrHostOrFrameOwner):
(WebCore::showSubTreeAcrossFrame):

• dom/ShadowRoot.h:

(WebCore::ShadowRoot::youngerShadowRoot):
(WebCore::ShadowRoot::olderShadowRoot):
(WebCore::toShadowRoot):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.cpp (modified) (5 diffs)
• dom/ShadowRoot.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-24  Hayato Ito  <hayato@chromium.org>
+
+        Make Node::showTreeForThis (and Node::showTreeForThisAcrossFrame) dump multiple shadow roots.
+        https://bugs.webkit.org/show_bug.cgi?id=79351
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests since these utility functions are only available in debug build.
+        I manually tested in GDB session.
+
+        * dom/Node.cpp:
+        (WebCore::oldestShadowRootFor):
+        (WebCore::traverseTreeAndMark):
+        (WebCore::parentOrHostOrFrameOwner):
+        (WebCore::showSubTreeAcrossFrame):
+        * dom/ShadowRoot.h:
+        (WebCore::ShadowRoot::youngerShadowRoot):
+        (WebCore::ShadowRoot::olderShadowRoot):
+        (WebCore::toShadowRoot):
+        (WebCore):
+
 2012-02-24  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -810 +810 @@
 }
 
-inline static ShadowRoot* oldestShadowRoot(Node* node)
+inline static ShadowRoot* oldestShadowRootFor(const Node* node)
 {
     return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowRootList()->oldestShadowRoot() : 0;
@@ -2270 +2270 @@
         fprintf(stderr, "%s", indent.utf8().data());
         node->showNode();
-
         if (node->isShadowRoot()) {
-            if (ShadowRoot* youngerShadowRoot = toShadowRoot(const_cast<Node*>(node))->youngerShadowRoot())
+            if (ShadowRoot* youngerShadowRoot = toShadowRoot(node)->youngerShadowRoot())
                 traverseTreeAndMark(indent + "\t", youngerShadowRoot, markedNode1, markedLabel1, markedNode2, markedLabel2);
-        } else if (ShadowRoot* rootNode = oldestShadowRoot(const_cast<Node*>(node)))
-            traverseTreeAndMark(indent + "\t", rootNode, markedNode1, markedLabel1, markedNode2, markedLabel2);
+        } else if (ShadowRoot* oldestShadowRoot = oldestShadowRootFor(node))
+            traverseTreeAndMark(indent + "\t", oldestShadowRoot, markedNode1, markedLabel1, markedNode2, markedLabel2);
     }
 }
@@ -2305 +2304 @@
 }
 
-static ContainerNode* parentOrHostOrFrameOwner(Node* node)
+static ContainerNode* parentOrHostOrFrameOwner(const Node* node)
 {
     ContainerNode* parent = node->parentOrHostNode();
@@ -2313 +2312 @@
 }
 
-static void showSubTreeAcrossFrame(Node* node, const Node* markedNode, const String& indent)
+static void showSubTreeAcrossFrame(const Node* node, const Node* markedNode, const String& indent)
 {
     if (node == markedNode)
@@ -2319 +2318 @@
     fputs(indent.utf8().data(), stderr);
     node->showNode();
-    if (node->isFrameOwnerElement())
-        showSubTreeAcrossFrame(static_cast<HTMLFrameOwnerElement*>(node)->contentDocument(), markedNode, indent + "\t");
-    if (node->isShadowRoot()) {
-        if (ShadowRoot* youngerShadowRoot = toShadowRoot(node)->youngerShadowRoot())
-            showSubTreeAcrossFrame(youngerShadowRoot, markedNode, indent + "\t");
-    } else if (ShadowRoot* shadowRoot = oldestShadowRoot(node))
-        showSubTreeAcrossFrame(shadowRoot, markedNode, indent + "\t");
+     if (node->isShadowRoot()) {
+         if (ShadowRoot* youngerShadowRoot = toShadowRoot(node)->youngerShadowRoot())
+             showSubTreeAcrossFrame(youngerShadowRoot, markedNode, indent + "\t");
+     } else {
+         if (node->isFrameOwnerElement())
+             showSubTreeAcrossFrame(static_cast<const HTMLFrameOwnerElement*>(node)->contentDocument(), markedNode, indent + "\t");
+         if (ShadowRoot* oldestShadowRoot = oldestShadowRootFor(node))
+             showSubTreeAcrossFrame(oldestShadowRoot, markedNode, indent + "\t");
+     }
     for (Node* child = node->firstChild(); child; child = child->nextSibling())
         showSubTreeAcrossFrame(child, markedNode, indent + "\t");

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -73 +73 @@
     ShadowRootList* list() const;
 
-    ShadowRoot* youngerShadowRoot() { return prev(); }
-    ShadowRoot* olderShadowRoot() { return next(); }
+    ShadowRoot* youngerShadowRoot() const { return prev(); }
+    ShadowRoot* olderShadowRoot() const { return next(); }
 
     bool hasContentElement() const;
@@ -91 +91 @@
 };
 
+inline const ShadowRoot* toShadowRoot(const Node* node)
+{
+    ASSERT(!node || node->isShadowRoot());
+    return static_cast<const ShadowRoot*>(node);
+}
+
 inline ShadowRoot* toShadowRoot(Node* node)
 {
-    ASSERT(!node || node->isShadowRoot());
-    return static_cast<ShadowRoot*>(node);
+    return const_cast<ShadowRoot*>(toShadowRoot(static_cast<const Node*>(node)));
 }