Changeset 74715 in webkit

Timestamp:

Dec 28, 2010 10:55:42 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2010-12-28 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Eric Seidel.

Combine setShadowRoot and clearShadowRoot into a simpler API
​https://bugs.webkit.org/show_bug.cgi?id=50971

No change in behavior, and API is not used yet.

• dom/Element.cpp: (WebCore::Element::setShadowRoot): Combined clearing and setting of

the shadowRoot, also hooked up with setting and clearing of the
corresponding shadowHost values.

• dom/Element.h: renamed clearShadowRoot to removeShadowRoot and made it

private.

• dom/Node.h: Made shadow host-related functions public so that

Element::setShadowRoot can access setShadowHost. It seems logical
to make shadowHost public as well to keep the defs together.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-28  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Combine setShadowRoot and clearShadowRoot into a simpler API
+        https://bugs.webkit.org/show_bug.cgi?id=50971
+
+        No change in behavior, and API is not used yet.
+
+        * dom/Element.cpp:
+        (WebCore::Element::setShadowRoot): Combined clearing and setting of
+            the shadowRoot, also hooked up with setting and clearing of the
+            corresponding shadowHost values.
+        * dom/Element.h: renamed clearShadowRoot to removeShadowRoot and made it
+            private.
+        * dom/Node.h: Made shadow host-related functions public so that
+            Element::setShadowRoot can access setShadowHost. It seems logical
+            to make shadowHost public as well to keep the defs together.
+
 2010-12-28  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebCore/dom/Element.cpp

@@ -1083 +1083 @@
 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()
+    // FIXME: Because today this is never called from script directly, we don't have to worry
+    // about compromising DOM tree integrity (eg. node being a parent of this). However,
+    // once we implement XBL2, we will have to add integrity checks here.
+    removeShadowRoot();
+    RefPtr<Node> newRoot = node;
+    if (!newRoot)
+        return;
+
+    ensureRareData()->m_shadowRoot = newRoot;
+    newRoot->setShadowHost(this);
+}
+
+void Element::removeShadowRoot()
 {
     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);
+    if (RefPtr<Node> oldRoot = rareData()->m_shadowRoot.release()) {
+        document()->removeFocusedNodeOfSubtree(oldRoot.get());
+        oldRoot->setShadowHost(0);
+        if (oldRoot->inDocument())
+            oldRoot->removedFromDocument();
+        else
+            oldRoot->removedFromTree(true);
+    }
 }
 

trunk/WebCore/dom/Element.h

@@ -228 +228 @@
     Node* shadowRoot();
     void setShadowRoot(PassRefPtr<Node>);
-    void clearShadowRoot();
 
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
@@ -393 +392 @@
 
     SpellcheckAttributeState spellcheckAttributeState() const;
+    void removeShadowRoot();
 
 private:

trunk/WebCore/dom/Node.h

@@ -217 +217 @@
     ContainerNode* parentNodeGuaranteedHostFree() const;
 
+    Element* shadowHost() const;
+    void setShadowHost(Element*);
+
     // Returns the enclosing event parent node (or self) that, when clicked, would trigger a navigation.
     Node* enclosingLinkEventParentOrSelf();
@@ -639 +642 @@
     NodeRareData* ensureRareData();
 
-    Element* shadowHost() const;
-    void setShadowHost(Element*);
-
 private:
 #if USE(JSC)