Changeset 88908 in webkit

Timestamp:

Jun 14, 2011 11:24:15 PM (13 years ago)

Author:

morrita@google.com

Message:

2011-06-09 MORITA Hajime <​morrita@google.com>

Reviewed by Dimitri Glazkov.

ShadowContentElement should detach its inclusions before attaching them.
​https://bugs.webkit.org/show_bug.cgi?id=62428

• On ShadowContentElement::attach(), changed inclusion attach scheme from per-node reattach() to detach()-all-and-attach()-them. This eliminates attach() order problems which ShadowContentElement possibly has.
• Changed ShadowContentElement to have m_inclusions as a member variable, which will be used by upcoming changes.
• Moved attach() code from ShadowContentSelector to ShadowContentElement because the element now owns the inclusion list.

No new tests. No visible behavioral change yet.

• dom/ShadowContentElement.cpp: (WebCore::ShadowContentElement::attach): (WebCore::ShadowContentElement::detach): Added.
• dom/ShadowContentElement.h: (WebCore::ShadowContentElement::inclusionAt): Added. (WebCore::ShadowContentElement::inclusionCount): Added. (WebCore::toShadowContentElement):
• dom/ShadowContentSelector.cpp: Removed attachChildrenFor() (WebCore::ShadowContentSelector::selectInclusion): Extracted from attachChildrenFor() (WebCore::ShadowContentSelector::willAttachContentFor): Extracted from attachChildrenFor() (WebCore::ShadowContentSelector::didAttachContent): Extracted from attachChildrenFor() (WebCore::ShadowContentSelector::activeElement):
• dom/ShadowContentSelector.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ShadowContentElement.cpp (modified) (1 diff)
• dom/ShadowContentElement.h (modified) (2 diffs)
• dom/ShadowContentSelector.cpp (modified) (2 diffs)
• dom/ShadowContentSelector.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-09  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        ShadowContentElement should detach its inclusions before attaching them.
+        https://bugs.webkit.org/show_bug.cgi?id=62428
+
+        - On ShadowContentElement::attach(), changed inclusion attach scheme
+          from per-node reattach() to detach()-all-and-attach()-them.  This
+          eliminates attach() order problems which ShadowContentElement
+          possibly has.
+        - Changed ShadowContentElement to have m_inclusions as a member variable,
+          which will be used by upcoming changes.
+        - Moved attach() code from ShadowContentSelector to ShadowContentElement
+          because the element now owns the inclusion list.
+        
+        No new tests. No visible behavioral change yet.
+
+        * dom/ShadowContentElement.cpp:
+        (WebCore::ShadowContentElement::attach):
+        (WebCore::ShadowContentElement::detach): Added.
+        * dom/ShadowContentElement.h:
+        (WebCore::ShadowContentElement::inclusionAt): Added.
+        (WebCore::ShadowContentElement::inclusionCount): Added.
+        (WebCore::toShadowContentElement):
+        * dom/ShadowContentSelector.cpp: Removed attachChildrenFor()
+        (WebCore::ShadowContentSelector::selectInclusion): Extracted from attachChildrenFor()
+        (WebCore::ShadowContentSelector::willAttachContentFor): Extracted from attachChildrenFor()
+        (WebCore::ShadowContentSelector::didAttachContent): Extracted from attachChildrenFor()
+        (WebCore::ShadowContentSelector::activeElement):
+        * dom/ShadowContentSelector.h:
+
 2011-06-14  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/dom/ShadowContentElement.cpp

@@ -35 +35 @@
 {
     ASSERT(!firstChild()); // Currently doesn't support any light child.
-    Element::attach();
-    if (ShadowContentSelector* selector = ShadowContentSelector::currentInstance())
-        selector->attachChildrenFor(this);
+    StyledElement::attach();
+    if (ShadowContentSelector* selector = ShadowContentSelector::currentInstance()) {
+        selector->willAttachContentFor(this);
+        selector->selectInclusion(m_inclusions);
+        for (size_t i = 0; i < m_inclusions.size(); ++i)
+            m_inclusions[i]->detach();
+        for (size_t i = 0; i < m_inclusions.size(); ++i)
+            m_inclusions[i]->attach();
+        selector->didAttachContent();
+    }
+}
+
+void ShadowContentElement::detach()
+{
+    m_inclusions.clear();
+    StyledElement::detach();
 }
 

trunk/Source/WebCore/dom/ShadowContentElement.h

@@ -48 +48 @@
     virtual bool shouldInclude(Node*) = 0;
     virtual void attach();
+    virtual void detach();
+
+    Node* inclusionAt(size_t) const;
+    size_t inclusionCount() const;
 
 private:
@@ -53 +57 @@
     virtual bool rendererIsNeeded(const NodeRenderingContext&) { return false; }
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) { return 0; }
+
+    Vector<RefPtr<Node> > m_inclusions;
 };
+
+inline Node* ShadowContentElement::inclusionAt(size_t index) const
+{
+    return m_inclusions.at(index).get();
+}
+
+inline size_t ShadowContentElement::inclusionCount() const
+{
+    return m_inclusions.size();
+}
+
+inline ShadowContentElement* toShadowContentElement(Node* node)
+{
+    ASSERT(!node || node->isContentElement());
+    return static_cast<ShadowContentElement*>(node);
+}
 
 }

trunk/Source/WebCore/dom/ShadowContentSelector.cpp

@@ -52 +52 @@
 }
 
-void ShadowContentSelector::attachChildrenFor(ShadowContentElement* contentElement)
+void ShadowContentSelector::selectInclusion(Vector<RefPtr<Node> >& inclusions)
 {
-    m_activeElement = contentElement;
+    inclusions.clear();
 
     for (size_t i = 0; i < m_children.size(); ++i) {
@@ -60 +60 @@
         if (!child)
             continue;
-        if (!contentElement->shouldInclude(child))
+        if (!m_activeElement->shouldInclude(child))
             continue;
 
-        child->reattach();
+        inclusions.append(child);
         m_children[i] = 0;
     }
+}
 
+void ShadowContentSelector::willAttachContentFor(ShadowContentElement* element)
+{
+    ASSERT(!m_activeElement);
+    m_activeElement = element;
+}
+
+void ShadowContentSelector::didAttachContent()
+{
+    ASSERT(m_activeElement);
     m_activeElement = 0;
 }
 
+Element* ShadowContentSelector::activeElement() const
+{
+    return m_activeElement;
 }
+
+}

trunk/Source/WebCore/dom/ShadowContentSelector.h

@@ -48 +48 @@
     ~ShadowContentSelector();
 
-    void attachChildrenFor(ShadowContentElement*);
+    void willAttachContentFor(ShadowContentElement*);
+    void didAttachContent();
+    void selectInclusion(Vector<RefPtr<Node> >& inclusions);
+
     ShadowRoot* shadowRoot() const { return m_shadowRoot; }
-    Element* activeElement() const { return m_activeElement; }
+    Element* activeElement() const;
 
     static ShadowContentSelector* currentInstance() { return s_currentInstance; }
@@ -57 +60 @@
     ShadowContentSelector* m_parent;
     ShadowRoot* m_shadowRoot;
-    Element* m_activeElement;
+    ShadowContentElement* m_activeElement;
     Vector<RefPtr<Node> > m_children;