Attachment 95398 Details for Bug 61727 – Addressed the review comments.

[patch] Addressed the review comments.

bug-61727-20110531150141.patch (text/plain), 3.81 KB, created by Hayato Ito on 2011-05-30 23:01:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Hayato Ito

Created: 2011-05-30 23:01:44 PDT

Size: 3.81 KB

patch

obsolete

>Subversion Revision: 87361
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7f05d7f7aefaf7470cdfb463c6bdb9d7ad38fbc1..000e4cbecc4c055df32deb7e364461f791d74f98 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2011-05-30  Hayato Ito  <hayato@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a utility function for dumping a tree for the Node, including a document of a frame.
>+        https://bugs.webkit.org/show_bug.cgi?id=61727
>+
>+        No new tests since added functions are only available in debug builds.
>+
>+        * dom/Node.cpp:
>+        (WebCore::Node::parentOrHostOrFrameOwner):
>+        (WebCore::Node::traverseNextNodeAcrossFrame):
>+        (WebCore::Node::showTreeForThisAcrossFrame):
>+        * dom/Node.h:
>+
> 2011-05-25  James Simonsen  <simonjam@chromium.org>
> 
>         Reviewed by Adam Barth.
>diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
>index 7cf32664751f58b7e296d09a5f73fc93527318af..3a2a962fa62fe78fabf275e8a5daca41b34a1595 100644
>--- a/Source/WebCore/dom/Node.cpp
>+++ b/Source/WebCore/dom/Node.cpp
>@@ -57,6 +57,7 @@
> #include "Frame.h"
> #include "FrameView.h"
> #include "HTMLElement.h"
>+#include "HTMLFrameOwnerElement.h"
> #include "HTMLNames.h"
> #include "InspectorInstrumentation.h"
> #include "KeyboardEvent.h"
>@@ -2375,6 +2376,48 @@ void Node::formatForDebugger(char* buffer, unsigned length) const
>     strncpy(buffer, result.utf8().data(), length - 1);
> }
> 
>+ContainerNode* Node::parentOrHostOrFrameOwner() const
>+{
>+    ContainerNode* parent = parentOrHostNode();
>+    if (!parent && document() && document()->frame())
>+        parent = document()->frame()->ownerElement();
>+    return parent;
>+}
>+
>+Node* Node::traverseNextNodeAcrossFrame() const
>+{
>+    if (isFrameOwnerElement())
>+        return static_cast<const HTMLFrameOwnerElement*>(this)->contentDocument();
>+    if (ShadowRoot* shadow = shadowRoot(const_cast<Node*>(this)))
>+        return shadow->traverseNextNodeAcrossFrame();
>+    if (firstChild())
>+        return firstChild();
>+    if (nextSibling())
>+        return nextSibling();
>+    const Node* n = this;
>+    while (n && !n->nextSibling())
>+        n = n->parentOrHostOrFrameOwner();
>+    if (n)
>+        return n->nextSibling();
>+    return 0;
>+}
>+
>+void Node::showTreeForThisAcrossFrame() const
>+{
>+    const Node* rootNode = this;
>+    while (rootNode->parentOrHostOrFrameOwner())
>+        rootNode = rootNode->parentOrHostOrFrameOwner();
>+    for (const Node* node = rootNode; node; node = node->traverseNextNodeAcrossFrame()) {
>+        if (node == this)
>+            fputs("*", stderr);
>+        String indent;
>+        for (const Node* tmpNode = node; tmpNode && tmpNode != rootNode; tmpNode = tmpNode->parentOrHostOrFrameOwner())
>+            indent += "\t";
>+        fputs(indent.utf8().data(), stderr);
>+        node->showNode();
>+    }
>+}
>+
> #endif
> 
> // --------
>diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h
>index b9da94f208fb573be5a73e818fea115997d320ab..613b45ad61f78e473a6a55ae1528a3e4dc1dff36 100644
>--- a/Source/WebCore/dom/Node.h
>+++ b/Source/WebCore/dom/Node.h
>@@ -501,6 +501,7 @@ public:
>     void showNode(const char* prefix = "") const;
>     void showTreeForThis() const;
>     void showTreeAndMark(const Node* markedNode1, const char* markedLabel1, const Node* markedNode2 = 0, const char* markedLabel2 = 0) const;
>+    void showTreeForThisAcrossFrame() const;
> #endif
> 
>     void removeNodeListCacheIfPossible();
>@@ -714,6 +715,11 @@ protected:
>     void setHasRareSVGData() { setFlag(HasSVGRareDataFlag); }
>     void clearHasRareSVGData() { clearFlag(HasSVGRareDataFlag); }
> #endif
>+
>+#ifndef NDEBUG
>+    ContainerNode* parentOrHostOrFrameOwner() const;
>+    Node* traverseNextNodeAcrossFrame() const;
>+#endif
> };
> 
> // Used in Node::addSubresourceAttributeURLs() and in addSubresourceStyleURLs()

Flags:

rniwa: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 61727: 95342 | 95392 | 95398