Changeset 117796 in webkit

Timestamp:

May 21, 2012, 9:59:02 AM (14 years ago)

Author:

morrita@google.com

Message:

[Refactoring] Node should have youngestShadowRoot.
​https://bugs.webkit.org/show_bug.cgi?id=86427

Reviewed by Dimitri Glazkov.

This change adds Node::youngestShadowRoot() and replaced
ElementShadow::youngestShadowRoot() with it if appropriate.

By introducing this, traversal across node and its shadow tree can
look more fluent and idiomatic. There are a few non-trivial traversal
remaining like ElementShadow::recalcStyle() and attach().
But they should be flattened out eventually.

No new tests. Refactoring.

• dom/ContainerNodeAlgorithms.cpp:

(WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoTree):

• dom/Document.cpp:

(WebCore::Document::buildAccessKeyMap):

• dom/ElementShadow.cpp:
• dom/ElementShadow.h:

(ElementShadow):
(WebCore::Node::youngestShadowRoot):
(WebCore):

• dom/Node.h:

(Node):

• dom/TreeScopeAdopter.cpp:

(WebCore::TreeScopeAdopter::moveTreeToNewScope):
(WebCore::TreeScopeAdopter::moveTreeToNewDocument):

• dom/TreeScopeAdopter.h:

(TreeScopeAdopter):

• html/shadow/TextFieldDecorationElement.cpp:

(WebCore::getDecorationRootAndDecoratedRoot):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNodeAlgorithms.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/ElementShadow.cpp (modified) (1 diff)
• dom/ElementShadow.h (modified) (3 diffs)
• dom/Node.h (modified) (1 diff)
• dom/TreeScopeAdopter.cpp (modified) (2 diffs)
• dom/TreeScopeAdopter.h (modified) (1 diff)
• html/shadow/TextFieldDecorationElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  MORITA Hajime  <morrita@google.com>
+
+        [Refactoring] Node should have youngestShadowRoot.
+        https://bugs.webkit.org/show_bug.cgi?id=86427
+
+        Reviewed by Dimitri Glazkov.
+
+        This change adds Node::youngestShadowRoot() and replaced
+        ElementShadow::youngestShadowRoot() with it if appropriate.
+
+        By introducing this, traversal across node and its shadow tree can
+        look more fluent and idiomatic. There are a few non-trivial traversal
+        remaining like ElementShadow::recalcStyle() and attach().
+        But they should be flattened out eventually.
+
+        No new tests. Refactoring.
+
+        * dom/ContainerNodeAlgorithms.cpp:
+        (WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoTree):
+        * dom/Document.cpp:
+        (WebCore::Document::buildAccessKeyMap):
+        * dom/ElementShadow.cpp:
+        * dom/ElementShadow.h:
+        (ElementShadow):
+        (WebCore::Node::youngestShadowRoot):
+        (WebCore):
+        * dom/Node.h:
+        (Node):
+        * dom/TreeScopeAdopter.cpp:
+        (WebCore::TreeScopeAdopter::moveTreeToNewScope):
+        (WebCore::TreeScopeAdopter::moveTreeToNewDocument):
+        * dom/TreeScopeAdopter.h:
+        (TreeScopeAdopter):
+        * html/shadow/TextFieldDecorationElement.cpp:
+        (WebCore::getDecorationRootAndDecoratedRoot):
+
 2012-05-21  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp

@@ -62 +62 @@
     }
 
-    if (!node->isElementNode())
-        return;
-
-    if (ElementShadow* shadow = toElement(node)->shadow()) {
-        for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
-            notifyNodeInsertedIntoTree(root);
-    }
+    for (ShadowRoot* root = node->youngestShadowRoot(); root; root = root->olderShadowRoot())
+        notifyNodeInsertedIntoTree(root);
 }
 

trunk/Source/WebCore/dom/Document.cpp

@@ -720 +720 @@
             m_elementsByAccessKey.set(accessKey.impl(), element);
 
-        if (ElementShadow* shadow = element->shadow()) {
-            for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
-                buildAccessKeyMap(root);
-        }
+        for (ShadowRoot* root = node->youngestShadowRoot(); root; root = root->olderShadowRoot())
+            buildAccessKeyMap(root);
     }
 }

trunk/Source/WebCore/dom/ElementShadow.cpp

@@ -111 +111 @@
 }
 
-void ElementShadow::setParentTreeScope(TreeScope* scope)
-{
-    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
-        root->setParentTreeScope(scope);
-}
-
 void ElementShadow::attach()
 {

trunk/Source/WebCore/dom/ElementShadow.h

@@ -29 +29 @@
 
 #include "ContentDistributor.h"
+#include "Element.h"
 #include "ExceptionCode.h"
 #include "ShadowRoot.h"
@@ -53 +54 @@
 
     void addShadowRoot(Element* shadowHost, PassRefPtr<ShadowRoot>, ExceptionCode&);
-
-    void setParentTreeScope(TreeScope*);
 
     void attach();
@@ -116 +115 @@
 }
 
+inline ShadowRoot* Node::youngestShadowRoot() const
+{
+    if (!this->isElementNode())
+        return 0;
+    if (ElementShadow* shadow = toElement(this)->shadow())
+        return shadow->youngestShadowRoot();
+    return 0;
+}
+
 class ShadowRootVector : public Vector<RefPtr<ShadowRoot> > {
 public:

trunk/Source/WebCore/dom/Node.h

@@ -224 +224 @@
     Node* shadowAncestorNode() const;
     ShadowRoot* shadowRoot() const;
+    ShadowRoot* youngestShadowRoot() const;
+
     // Returns 0, a child of ShadowRoot, or a legacy shadow root.
     Node* nonBoundaryShadowTreeRootNode();

trunk/Source/WebCore/dom/TreeScopeAdopter.cpp

@@ -64 +64 @@
             moveNodeToNewDocument(node, oldDocument, newDocument);
 
-        if (ElementShadow* shadow = shadowFor(node)) {
+        for (ShadowRoot* shadow = node->youngestShadowRoot(); shadow; shadow = shadow->olderShadowRoot()) {
             shadow->setParentTreeScope(m_newScope);
             if (willMoveToNewDocument)
-                moveShadowToNewDocument(shadow, oldDocument, newDocument);
+                moveTreeToNewDocument(shadow, oldDocument, newDocument);
         }
     }
@@ -76 +76 @@
     for (Node* node = root; node; node = node->traverseNextNode(root)) {
         moveNodeToNewDocument(node, oldDocument, newDocument);
-        if (ElementShadow* shadow = shadowFor(node))
-            moveShadowToNewDocument(shadow, oldDocument, newDocument);
+        for (ShadowRoot* shadow = node->youngestShadowRoot(); shadow; shadow = shadow->olderShadowRoot())
+            moveTreeToNewDocument(shadow, oldDocument, newDocument);
     }
-}
-
-inline void TreeScopeAdopter::moveShadowToNewDocument(ElementShadow* shadow, Document* oldDocument, Document* newDocument) const
-{
-    for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
-        moveTreeToNewDocument(root, oldDocument, newDocument);
 }
 

trunk/Source/WebCore/dom/TreeScopeAdopter.h

@@ -47 +47 @@
     void moveTreeToNewDocument(Node*, Document* oldDocument, Document* newDocument) const;
     void moveNodeToNewDocument(Node*, Document* oldDocument, Document* newDocument) const;
-    void moveShadowToNewDocument(ElementShadow*, Document* oldDocument, Document* newDocument) const;
 
     Node* m_toAdopt;

trunk/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp

@@ -69 +69 @@
 static inline void getDecorationRootAndDecoratedRoot(HTMLInputElement* input, ShadowRoot*& decorationRoot, ShadowRoot*& decoratedRoot)
 {
-    ShadowRoot* existingRoot = input->shadow()->youngestShadowRoot();
+    ShadowRoot* existingRoot = input->youngestShadowRoot();
     ShadowRoot* newRoot = 0;
     while (existingRoot->childNodeCount() == 1 && existingRoot->firstChild()->hasTagName(shadowTag)) {