Changeset 73114 in webkit

Timestamp:

Dec 2, 2010 1:15:00 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2010-12-02 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Kent Tamura.

Provide means to store shadow DOM nodes on Element
​https://bugs.webkit.org/show_bug.cgi?id=48697

Adds shadow DOM awareness to the standard Node attach/detach,
document and tree insertion and removal cycle.

No new tests, because the code is not yet used.

• dom/Element.cpp: (WebCore::Element::insertedIntoDocument): Added logic to cascade down to shadow DOM, if present. (WebCore::Element::removedFromDocument): Ditto. (WebCore::Element::insertedIntoTree): Ditto. (WebCore::Element::removedFromTree): Ditto. (WebCore::Element::attach): Ditto. (WebCore::Element::detach): Ditto. (WebCore::Element::recalcStyle): (WebCore::Element::shadowRoot): Added. (WebCore::Element::setShadowRoot): Added. (WebCore::Element::clearShadowRoot): Added.
• dom/Element.h: Added decls.
• dom/ElementRareData.h: Added a member to hold a RefPtr to the shadow DOM root for the element.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (6 diffs)
• dom/Element.h (modified) (2 diffs)
• dom/ElementRareData.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Provide means to store shadow DOM nodes on Element
+        https://bugs.webkit.org/show_bug.cgi?id=48697
+
+        Adds shadow DOM awareness to the standard Node attach/detach,
+        document and tree insertion and removal cycle.
+
+        No new tests, because the code is not yet used.
+
+        * dom/Element.cpp:
+        (WebCore::Element::insertedIntoDocument): Added logic to cascade down to shadow DOM, if present.
+        (WebCore::Element::removedFromDocument): Ditto.
+        (WebCore::Element::insertedIntoTree): Ditto.
+        (WebCore::Element::removedFromTree): Ditto.
+        (WebCore::Element::attach): Ditto.
+        (WebCore::Element::detach): Ditto.
+        (WebCore::Element::recalcStyle):
+        (WebCore::Element::shadowRoot): Added.
+        (WebCore::Element::setShadowRoot): Added.
+        (WebCore::Element::clearShadowRoot): Added.
+        * dom/Element.h: Added decls.
+        * dom/ElementRareData.h: Added a member to hold a RefPtr to the shadow DOM root for the element.
+
 2010-12-02  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/dom/Element.cpp

@@ -857 +857 @@
     // by the time we reach updateId
     ContainerNode::insertedIntoDocument();
+    if (Node* shadow = shadowRoot())
+        shadow->insertedIntoDocument();
 
     if (hasID()) {
@@ -878 +880 @@
 
     ContainerNode::removedFromDocument();
+    if (Node* shadow = shadowRoot())
+        shadow->removedFromDocument();
+}
+
+void Element::insertedIntoTree(bool deep)
+{
+    ContainerNode::insertedIntoTree(deep);
+    if (!deep)
+        return;
+    if (Node* shadow = shadowRoot())
+        shadow->insertedIntoTree(true);
+}
+
+void Element::removedFromTree(bool deep)
+{
+    ContainerNode::removedFromTree(deep);
+    if (!deep)
+        return;
+    if (Node* shadow = shadowRoot())
+        shadow->removedFromTree(true);
 }
 
@@ -887 +909 @@
     createRendererIfNeeded();
     ContainerNode::attach();
+    if (Node* shadow = shadowRoot())
+        shadow->attach();
     if (hasRareData()) {   
         ElementRareData* data = rareData();
@@ -908 +932 @@
         rareData()->resetComputedStyle();
     ContainerNode::detach();
+    if (Node* shadow = shadowRoot())
+        shadow->detach();
 
     RenderWidget::resumeWidgetHierarchyUpdates();
@@ -961 +987 @@
     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
 
-#if ENABLE(SVG)
-    if (!hasParentStyle && isShadowNode() && isSVGElement())
+    if (!hasParentStyle && isShadowNode())
         hasParentStyle = true;
-#endif
 
     if ((change > NoChange || needsStyleRecalc())) {
@@ -1043 +1067 @@
             forceCheckOfNextElementSibling = childRulesChanged && hasDirectAdjacentRules;
     }
+    // FIXME: This does not care about sibling combinators. Will be necessary in XBL2 world.
+    if (Node* shadow = shadowRoot()) {
+        if (change >= Inherit || shadow->isTextNode() || shadow->childNeedsStyleRecalc() || shadow->needsStyleRecalc())
+            shadow->recalcStyle(change);
+    }
 
     clearNeedsStyleRecalc();
     clearChildNeedsStyleRecalc();
+}
+
+Node* Element::shadowRoot()
+{
+    return hasRareData() ? rareData()->m_shadowRoot.get() : 0;
+}
+
+void Element::setShadowRoot(PassRefPtr<Node> node)
+{
+    ASSERT(node);
+
+    // FIXME: Once all instances of shadow DOM are converted to use this code, add setting of shadow host (shadowParent) on node.
+    ensureRareData()->m_shadowRoot = node;
+}
+
+void Element::clearShadowRoot()
+{
+    if (!hasRareData())
+        return;
+
+    RefPtr<Node> shadowRoot = rareData()->m_shadowRoot.release();
+    document()->removeFocusedNodeOfSubtree(shadowRoot.get());
+    // FIXME: Once all instances of shadow DOM are converted to use this code, add clearing of shadow host (shadowParent).
+    if (shadowRoot->inDocument())
+        shadowRoot->removedFromDocument();
+    else
+        shadowRoot->removedFromTree(true);
 }
 

trunk/WebCore/dom/Element.h

@@ -226 +226 @@
     virtual void recalcStyle(StyleChange = NoChange);
 
+    Node* shadowRoot();
+    void setShadowRoot(PassRefPtr<Node>);
+    void clearShadowRoot();
+
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
 
@@ -338 +342 @@
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
+    virtual void insertedIntoTree(bool);
+    virtual void removedFromTree(bool);
     virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 

trunk/WebCore/dom/ElementRareData.h

@@ -42 +42 @@
     IntSize m_minimumSizeForResizing;
     RefPtr<RenderStyle> m_computedStyle;
+    RefPtr<Node> m_shadowRoot;
 
     OwnPtr<DatasetDOMStringMap> m_datasetDOMStringMap;