Changeset 105387 in webkit

Timestamp:

Jan 18, 2012 11:05:58 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

ShadowContent query should be able to have fallback elements.
​https://bugs.webkit.org/show_bug.cgi?id=75306

Patch by Shinya Kawanaka <​shinyak@google.com> on 2012-01-18
Reviewed by Hajime Morita.

Source/WebCore:

When no elements are selected by a shadow content element selector query,
light children are selected as a fallback elements.

Test: fast/dom/shadow/shadow-contents-fallback.html

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::NodeRenderingContext):

Considers fallback phase. When no elements are chosen, the phase is set to 'fallback'.

(WebCore::NodeRenderingContext::nextRenderer):

Takes fallback phase into account.

(WebCore::NodeRenderingContext::previousRenderer): ditto.

• dom/NodeRenderingContext.h:
• html/shadow/HTMLContentElement.cpp:

(WebCore::HTMLContentElement::attach):

Calculates inclusions before attaching light children.

• html/shadow/HTMLContentElement.h:

(WebCore::HTMLContentElement::hasInclusion):

LayoutTests:

• fast/dom/shadow/shadow-contents-fallback-expected.txt: Added.
• fast/dom/shadow/shadow-contents-fallback.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-contents-fallback-expected.txt (added)
• LayoutTests/fast/dom/shadow/shadow-contents-fallback.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (4 diffs)
• Source/WebCore/dom/NodeRenderingContext.h (modified) (1 diff)
• Source/WebCore/html/shadow/HTMLContentElement.cpp (modified) (1 diff)
• Source/WebCore/html/shadow/HTMLContentElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-18  Shinya Kawanaka  <shinyak@google.com>
+
+        ShadowContent query should be able to have fallback elements.
+        https://bugs.webkit.org/show_bug.cgi?id=75306
+
+        Reviewed by Hajime Morita.
+
+        * fast/dom/shadow/shadow-contents-fallback-expected.txt: Added.
+        * fast/dom/shadow/shadow-contents-fallback.html: Added.
+
 2012-01-18  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-18  Shinya Kawanaka  <shinyak@google.com>
+
+        ShadowContent query should be able to have fallback elements.
+        https://bugs.webkit.org/show_bug.cgi?id=75306
+
+        Reviewed by Hajime Morita.
+
+        When no elements are selected by a shadow content element selector query,
+        light children are selected as a fallback elements.
+
+        Test: fast/dom/shadow/shadow-contents-fallback.html
+
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::NodeRenderingContext):
+          Considers fallback phase. When no elements are chosen, the phase is set to 'fallback'.
+        (WebCore::NodeRenderingContext::nextRenderer):
+          Takes fallback phase into account.
+        (WebCore::NodeRenderingContext::previousRenderer): ditto.
+        * dom/NodeRenderingContext.h:
+        * html/shadow/HTMLContentElement.cpp:
+        (WebCore::HTMLContentElement::attach):
+          Calculates inclusions before attaching light children.
+        * html/shadow/HTMLContentElement.h:
+        (WebCore::HTMLContentElement::hasInclusion):
+
 2012-01-18  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -74 +74 @@
                 m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_includer).parentNodeForRenderingAndStyle();
                 return;
-            } 
-                
+            }
+
             m_phase = AttachContentLight;
             m_parentNodeForRenderingAndStyle = parent;
             return;
+        }
+
+        if (parent->isContentElement()) {
+            HTMLContentElement* shadowContentElement = toHTMLContentElement(parent);
+            if (!shadowContentElement->hasInclusion()) {
+                m_phase = AttachContentFallback;
+                m_parentNodeForRenderingAndStyle = NodeRenderingContext(parent).parentNodeForRenderingAndStyle();
+                return;
+            }
         }
     }
@@ -177 +186 @@
     // Avoid an O(n^2) problem with this function by not checking for
     // nextRenderer() when the parent element hasn't attached yet.
-    if (m_node->parentOrHostNode() && !m_node->parentOrHostNode()->attached())
+    if (m_node->parentOrHostNode() && !m_node->parentOrHostNode()->attached() && m_phase != AttachContentFallback)
         return 0;
 
@@ -192 +201 @@
         }
     }
+
+    if (m_phase == AttachContentFallback)
+        return NodeRenderingContext(m_node->parentNode()).nextRenderer();
 
     return 0;
@@ -226 +238 @@
     }
 
+    if (m_phase == AttachContentFallback)
+        return NodeRenderingContext(m_node->parentNode()).previousRenderer();
+
     return 0;
 }

trunk/Source/WebCore/dom/NodeRenderingContext.h

@@ -80 +80 @@
         AttachContentLight,
         AttachContentForwarded,
+        AttachContentFallback,
     };
 

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

@@ -57 +57 @@
 void HTMLContentElement::attach()
 {
-    ASSERT(!firstChild()); // Currently doesn't support any light child.
-    HTMLElement::attach();
+    ShadowRoot* root = toShadowRoot(shadowTreeRootNode());
 
-    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
+    // Before calling StyledElement::attach, selector must be calculated.
+    if (root) {
         ContentInclusionSelector* selector = root->ensureInclusions();
         selector->unselect(m_inclusions.get());
         selector->select(this, m_inclusions.get());
+    }
+
+    HTMLElement::attach();
+
+    if (root) {
         for (ShadowInclusion* inclusion = m_inclusions->first(); inclusion; inclusion = inclusion->next())
             inclusion->content()->detach();

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

@@ -32 +32 @@
 #define HTMLContentElement_h
 
+#include "ContentInclusionSelector.h"
 #include "HTMLElement.h"
 #include <wtf/Forward.h>
@@ -60 +61 @@
 
     const ShadowInclusionList* inclusions() const { return m_inclusions.get(); }
+    bool hasInclusion() const { return inclusions()->first(); }
 
 protected: