Changeset 109864 in webkit

Timestamp:

Mar 5, 2012 10:59:02 PM (12 years ago)

Author:

shinyak@chromium.org

Message:

InsertionPoint::attach should be consistent with Element.
​https://bugs.webkit.org/show_bug.cgi?id=80373

Reviewed by Hajime Morita.

This patch is preparation for coming <shadow> patches.

InsertionPoint used to attach fallback elements before attaching distributed elements.
To be consistent with Element::attach behavior, attaching distributed elements first is
natural, because Element attaches a shadow tree first.

Also, this patch extracts a few methods form InsretionPoint::attach() and detach()
to keep code clean. They will become messy without this refactoring when adding
<shadow> patch.

No new tests. Should be covered by existing tests.

• html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::attach):
(WebCore::InsertionPoint::detach):
(WebCore::InsertionPoint::distributeHostChildren):
(WebCore):
(WebCore::InsertionPoint::clearDistribution):
(WebCore::InsertionPoint::attachDistributedNode):

• html/shadow/InsertionPoint.h:

(InsertionPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/InsertionPoint.cpp (modified) (3 diffs)
• html/shadow/InsertionPoint.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-05  Shinya Kawanaka  <shinyak@chromium.org>
+
+        InsertionPoint::attach should be consistent with Element.
+        https://bugs.webkit.org/show_bug.cgi?id=80373
+
+        Reviewed by Hajime Morita.
+
+        This patch is preparation for coming <shadow> patches.
+
+        InsertionPoint used to attach fallback elements before attaching distributed elements.
+        To be consistent with Element::attach behavior, attaching distributed elements first is
+        natural, because Element attaches a shadow tree first.
+
+        Also, this patch extracts a few methods form InsretionPoint::attach() and detach()
+        to keep code clean. They will become messy without this refactoring when adding
+        <shadow> patch.
+
+        No new tests. Should be covered by existing tests.
+
+        * html/shadow/InsertionPoint.cpp:
+        (WebCore::InsertionPoint::attach):
+        (WebCore::InsertionPoint::detach):
+        (WebCore::InsertionPoint::distributeHostChildren):
+        (WebCore):
+        (WebCore::InsertionPoint::clearDistribution):
+        (WebCore::InsertionPoint::attachDistributedNode):
+        * html/shadow/InsertionPoint.h:
+        (InsertionPoint):
+
 2012-03-05  Adam Barth  <abarth@webkit.org>
 

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

@@ -49 +49 @@
 void InsertionPoint::attach()
 {
-    ShadowRoot* root = toShadowRoot(shadowTreeRootNode());
-
-    if (root) {
-        HTMLContentSelector* selector = root->tree()->ensureSelector();
-        selector->unselect(&m_selections);
-        selector->select(this, &m_selections);
+    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
+        distributeHostChildren(root->tree());
+        attachDistributedNode();
     }
 
     HTMLElement::attach();
-
-    if (root) {
-        for (HTMLContentSelection* selection = m_selections.first(); selection; selection = selection->next())
-            selection->node()->attach();
-    }
 }
 
@@ -68 +60 @@
 {
     if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
-        if (HTMLContentSelector* selector = root->tree()->selector())
-            selector->unselect(&m_selections);
+        ShadowTree* tree = root->tree();
+        clearDistribution(tree);
 
         // When shadow element is detached, shadow tree should be recreated to re-calculate selector for
         // other insertion points.
-        root->tree()->setNeedsReattachHostChildrenAndShadow();
+        tree->setNeedsReattachHostChildrenAndShadow();
     }
 
@@ -92 +84 @@
 }
 
+inline void InsertionPoint::distributeHostChildren(ShadowTree* tree)
+{
+    HTMLContentSelector* selector = tree->ensureSelector();
+    selector->unselect(&m_selections);
+    selector->select(this, &m_selections);
+}
+
+inline void InsertionPoint::clearDistribution(ShadowTree* tree)
+{
+    if (HTMLContentSelector* selector = tree->selector())
+        selector->unselect(&m_selections);
+}
+
+inline void InsertionPoint::attachDistributedNode()
+{
+    for (HTMLContentSelection* selection = m_selections.first(); selection; selection = selection->next())
+        selection->node()->attach();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -55 +55 @@
     virtual bool rendererIsNeeded(const NodeRenderingContext&) OVERRIDE;
 
+private:
+    void distributeHostChildren(ShadowTree*);
+    void clearDistribution(ShadowTree*);
+    void attachDistributedNode();
+
     HTMLContentSelectionList m_selections;
 };