Changeset 84225 in webkit

Timestamp:

Apr 18, 2011 10:44:15 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-18 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Dimitri Glazkov.

Makes SVG shadow roots and DOM shadow roots distinct.
​https://bugs.webkit.org/show_bug.cgi?id=52788

Not a functional change. Covered by existing SVG tests.

• dom/EventDispatcher.cpp: (WebCore::findElementInstance): (WebCore::EventDispatcher::adjustToShadowBoundaries): (WebCore::EventDispatcher::adjustRelatedTarget): (WebCore::EventDispatcher::ensureEventAncestors):
• dom/Node.cpp: (WebCore::Node::setShadowHost): (WebCore::Node::svgShadowHost): (WebCore::Node::shadowTreeRootNode):
• dom/Node.h: (WebCore::Node::isSVGShadowRoot): (WebCore::Node::parentNode): (WebCore::Node::parentNodeGuaranteedHostFree):
• rendering/svg/RenderSVGShadowTreeRootContainer.cpp: (WebCore::RenderSVGShadowTreeRootContainer::~RenderSVGShadowTreeRootContainer): (WebCore::RenderSVGShadowTreeRootContainer::updateFromElement):
• rendering/svg/SVGShadowTreeElements.cpp: (WebCore::SVGShadowTreeRootElement::SVGShadowTreeRootElement): (WebCore::SVGShadowTreeRootElement::create): (WebCore::SVGShadowTreeRootElement::attachElement): (WebCore::SVGShadowTreeRootElement::clearSVGShadowHost):
• rendering/svg/SVGShadowTreeElements.h: (WebCore::SVGShadowTreeRootElement::isSVGShadowRoot):
• svg/SVGStyledElement.cpp: (WebCore::SVGStyledElement::title):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/EventDispatcher.cpp (modified) (8 diffs)
• dom/Node.cpp (modified) (3 diffs)
• dom/Node.h (modified) (5 diffs)
• rendering/svg/RenderSVGShadowTreeRootContainer.cpp (modified) (2 diffs)
• rendering/svg/SVGShadowTreeElements.cpp (modified) (2 diffs)
• rendering/svg/SVGShadowTreeElements.h (modified) (1 diff)
• svg/SVGStyledElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-18  Dominic Cooney  <dominicc@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Makes SVG shadow roots and DOM shadow roots distinct.
+        https://bugs.webkit.org/show_bug.cgi?id=52788
+
+        Not a functional change. Covered by existing SVG tests.
+
+        * dom/EventDispatcher.cpp:
+        (WebCore::findElementInstance):
+        (WebCore::EventDispatcher::adjustToShadowBoundaries):
+        (WebCore::EventDispatcher::adjustRelatedTarget):
+        (WebCore::EventDispatcher::ensureEventAncestors):
+        * dom/Node.cpp:
+        (WebCore::Node::setShadowHost):
+        (WebCore::Node::svgShadowHost):
+        (WebCore::Node::shadowTreeRootNode):
+        * dom/Node.h:
+        (WebCore::Node::isSVGShadowRoot):
+        (WebCore::Node::parentNode):
+        (WebCore::Node::parentNodeGuaranteedHostFree):
+        * rendering/svg/RenderSVGShadowTreeRootContainer.cpp:
+        (WebCore::RenderSVGShadowTreeRootContainer::~RenderSVGShadowTreeRootContainer):
+        (WebCore::RenderSVGShadowTreeRootContainer::updateFromElement):
+        * rendering/svg/SVGShadowTreeElements.cpp:
+        (WebCore::SVGShadowTreeRootElement::SVGShadowTreeRootElement):
+        (WebCore::SVGShadowTreeRootElement::create):
+        (WebCore::SVGShadowTreeRootElement::attachElement):
+        (WebCore::SVGShadowTreeRootElement::clearSVGShadowHost):
+        * rendering/svg/SVGShadowTreeElements.h:
+        (WebCore::SVGShadowTreeRootElement::isSVGShadowRoot):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::title):
+
 2011-04-18  Taiju TSUIKI  <develop@tzik.jp>
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -66 +66 @@
     // as a deeply cloned child of the 'use' element, except that events are dispatched to the SVGElementInstance objects
     for (Node* n = referenceNode; n; n = n->parentNode()) {
-        if (!n->isShadowRoot() || !n->isSVGElement())
+        if (!n->isSVGShadowRoot() || !n->isSVGElement())
             continue;
 
-        Element* shadowTreeParentElement = n->shadowHost();
+        Element* shadowTreeParentElement = n->svgShadowHost();
         ASSERT(shadowTreeParentElement->hasTagName(SVGNames::useTag));
 
@@ -123 +123 @@
 }
 
+static inline bool isShadowRootOrSVGShadowRoot(const Node* node)
+{
+    return node->isShadowRoot() || node->isSVGShadowRoot();
+}
+
 PassRefPtr<EventTarget> EventDispatcher::adjustToShadowBoundaries(PassRefPtr<Node> relatedTarget, const Vector<Node*> relatedTargetAncestors)
 {
@@ -134 +139 @@
     for (Vector<Node*>::const_iterator i = relatedTargetAncestors.end() - 1; i >= relatedTargetAncestors.begin(); --i) {
         if (diverged) {
-            if ((*i)->isShadowRoot()) {
+            if (isShadowRootOrSVGShadowRoot(*i)) {
                 firstDivergentBoundary = i + 1;
                 break;
@@ -148 +153 @@
         targetAncestor--;
 
-        if ((*i)->isShadowRoot())
+        if (isShadowRootOrSVGShadowRoot(*i))
             lowestCommonBoundary = targetAncestor;
 
@@ -157 +162 @@
     if (!diverged) {
         // The relatedTarget is a parent or shadowHost of the target.
-        if (m_node->isShadowRoot())
+        if (isShadowRootOrSVGShadowRoot(m_node.get()))
             lowestCommonBoundary = m_ancestors.begin();
     } else if ((*firstDivergentBoundary) == m_node.get()) {
@@ -204 +209 @@
     Node* outermostShadowBoundary = relatedTarget.get();
     for (Node* n = outermostShadowBoundary; n; n = n->parentOrHostNode()) {
-        if (n->isShadowRoot())
+        if (isShadowRootOrSVGShadowRoot(n))
             outermostShadowBoundary = n->parentOrHostNode();
         if (!noCommonBoundary)
@@ -241 +246 @@
     bool shouldSkipNextAncestor = false;
     while (true) {
-        if (ancestor->isShadowRoot()) {
+        bool isSVGShadowRoot = ancestor->isSVGShadowRoot();
+        if (isSVGShadowRoot || ancestor->isShadowRoot()) {
             if (behavior == StayInsideShadowDOM)
                 return;
-            ancestor = ancestor->shadowHost();
+            ancestor = isSVGShadowRoot ? ancestor->svgShadowHost() : ancestor->shadowHost();
             if (!shouldSkipNextAncestor)
                 target = ancestor;
@@ -255 +261 @@
 #if ENABLE(SVG)
         // Skip SVGShadowTreeRootElement.
-        shouldSkipNextAncestor = ancestor->isSVGElement() && ancestor->isShadowRoot();
+        shouldSkipNextAncestor = ancestor->isSVGShadowRoot();
         if (shouldSkipNextAncestor)
             continue;

trunk/Source/WebCore/dom/Node.cpp

@@ -549 +549 @@
 void Node::setShadowHost(Element* host)
 {
-    ASSERT(!parentNode());
+    ASSERT(!parentNode() && !isSVGShadowRoot());
     if (host)
         setFlag(IsShadowRootFlag);
@@ -1603 +1603 @@
 }
 
+#if ENABLE(SVG)
+SVGUseElement* Node::svgShadowHost() const
+{
+    return isSVGShadowRoot() ? static_cast<SVGUseElement*>(parent()) : 0;
+}
+#endif
+
 Node* Node::shadowAncestorNode()
 {
@@ -1624 +1631 @@
     Node* root = this;
     while (root) {
-        if (root->isShadowRoot())
+        if (root->isShadowRoot() || root->isSVGShadowRoot())
             return root;
         root = root->parentNodeGuaranteedHostFree();

trunk/Source/WebCore/dom/Node.h

@@ -72 +72 @@
 class RenderObject;
 class RenderStyle;
+#if ENABLE(SVG)
+class SVGUseElement;
+#endif
 class TagNodeList;
 class TreeScope;
@@ -192 +195 @@
 
     bool isSVGElement() const { return getFlag(IsSVGFlag); }
+    virtual bool isSVGShadowRoot() const { return false; }
+#if ENABLE(SVG)
+    SVGUseElement* svgShadowHost() const;
+#endif
 
 #if ENABLE(WML)
@@ -214 +221 @@
     Node* shadowTreeRootNode();
     bool isInShadowTree();
-    // Node's parent or shadow tree host.
+    // Node's parent, shadow tree host, or SVG use.
     ContainerNode* parentOrHostNode() const;
-    // Use when it's guaranteed to that shadowHost is 0.
+    // Use when it's guaranteed to that shadowHost is 0 and svgShadowHost is 0.
     ContainerNode* parentNodeGuaranteedHostFree() const;
 
@@ -734 +741 @@
 inline ContainerNode* Node::parentNode() const
 {
-    return getFlag(IsShadowRootFlag) ? 0 : parent();
+    return getFlag(IsShadowRootFlag) || isSVGShadowRoot() ? 0 : parent();
 }
 
@@ -744 +751 @@
 inline ContainerNode* Node::parentNodeGuaranteedHostFree() const
 {
-    ASSERT(!getFlag(IsShadowRootFlag));
+    ASSERT(!getFlag(IsShadowRootFlag) && !isSVGShadowRoot());
     return parentOrHostNode();
 }

trunk/Source/WebCore/rendering/svg/RenderSVGShadowTreeRootContainer.cpp

@@ -39 +39 @@
     if (m_shadowRoot && m_shadowRoot->attached()) {
         m_shadowRoot->detach();
-        m_shadowRoot->clearShadowHost();
+        m_shadowRoot->clearSVGShadowHost();
     }
 }
@@ -60 +60 @@
     }
 
-    ASSERT(m_shadowRoot->shadowHost() == useElement);
+    ASSERT(m_shadowRoot->svgShadowHost() == useElement);
 
     bool shouldRecreateTree = m_recreateTree;

trunk/Source/WebCore/rendering/svg/SVGShadowTreeElements.cpp

@@ -54 +54 @@
 // SVGShadowTreeRootElement
 
-inline SVGShadowTreeRootElement::SVGShadowTreeRootElement(Document* document, SVGUseElement* shadowParent)
+inline SVGShadowTreeRootElement::SVGShadowTreeRootElement(Document* document, SVGUseElement* host)
     : SVGShadowTreeContainerElement(document)
 {
-    setShadowHost(shadowParent);
+    setParent(host);
     setInDocument();
 }
 
-PassRefPtr<SVGShadowTreeRootElement> SVGShadowTreeRootElement::create(Document* document, SVGUseElement* shadowParent)
+PassRefPtr<SVGShadowTreeRootElement> SVGShadowTreeRootElement::create(Document* document, SVGUseElement* host)
 {
-    return adoptRef(new SVGShadowTreeRootElement(document, shadowParent));
+    return adoptRef(new SVGShadowTreeRootElement(document, host));
 }
 
 void SVGShadowTreeRootElement::attachElement(PassRefPtr<RenderStyle> style, RenderArena* arena)
 {
-    ASSERT(shadowHost());
+    ASSERT(svgShadowHost());
 
     // Create the renderer with the specified style
@@ -82 +82 @@
     // Add the renderer to the render tree
     if (renderer)
-        shadowHost()->renderer()->addChild(renderer);
+        svgShadowHost()->renderer()->addChild(renderer);
 }
 
-void SVGShadowTreeRootElement::clearShadowHost()
+void SVGShadowTreeRootElement::clearSVGShadowHost()
 {
-    setShadowHost(0);
+    setParent(0);
 }
 

trunk/Source/WebCore/rendering/svg/SVGShadowTreeElements.h

@@ -54 +54 @@
 class SVGShadowTreeRootElement : public SVGShadowTreeContainerElement {
 public:
-    static PassRefPtr<SVGShadowTreeRootElement> create(Document*, SVGUseElement* shadowParent);
+    static PassRefPtr<SVGShadowTreeRootElement> create(Document*, SVGUseElement* host);
 
     void attachElement(PassRefPtr<RenderStyle>, RenderArena*);
-    void clearShadowHost();
+    void clearSVGShadowHost();
+
+    virtual bool isSVGShadowRoot() const { return true; }
 
 private:
-    SVGShadowTreeRootElement(Document*, SVGUseElement* shadowParent);
+    SVGShadowTreeRootElement(Document*, SVGUseElement* host);
 };
 

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -82 +82 @@
     Node* parent = const_cast<SVGStyledElement*>(this);
     while (parent) {
-        if (!parent->isShadowRoot()) {
+        if (!parent->isSVGShadowRoot()) {
             parent = parent->parentNodeGuaranteedHostFree();
             continue;
@@ -88 +88 @@
         
         // Get the <use> element.
-        Element* shadowParent = parent->shadowHost();
+        Element* shadowParent = parent->svgShadowHost();
         if (shadowParent && shadowParent->isSVGElement() && shadowParent->hasTagName(SVGNames::useTag)) {
             SVGUseElement* useElement = static_cast<SVGUseElement*>(shadowParent);