Changeset 137418 in webkit

Timestamp:

Dec 11, 2012 10:24:30 PM (11 years ago)

Author:

tasak@google.com

Message:

Text nodes in shadow roots don't inherit style properly
​https://bugs.webkit.org/show_bug.cgi?id=101116

Reviewed by Hajime Morita.

Source/WebCore:

Use NodeRenderingContext to resolve styles of text nodes.
If text nodes are direct children of shadow roots, the text nodes
should be inherited styles from their shadow hosts.
But if reset-style-inheritance flag is true, the text nodes should
not be inherited. And if text nodes are distributed nodes,
we have to check whether their insertion point's
reset-style-inheritance.
c.f. shadow dom spec is:
​http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#styles

Test: fast/dom/shadow/text-node-in-shadow.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleForElement):
Modified to use defaultStyleForElement if the given element has
no parent style.
(WebCore::StyleResolver::initForStyleResolve):
Removed shouldResetStyleInheritance, because now NodeRenderingContext
resetStyleInheritance() takes care of reset-style-inheritance of
both shadow roots and insertion points.
(WebCore::StyleResolver::defaultStyleForElement):
Added to create a default style for elements.
(WebCore):
(WebCore::StyleResolver::styleForText):
Use NodeRenderingContext to find the parent node for style from the
given text node. If no parent node is found or reset-style-inheritance
is true, returns a default style (i.e. empty render style).
Otherwise, just returns the found node's style.

• css/StyleResolver.h:

(StyleResolver):

• dom/ComposedShadowTreeWalker.cpp:

(WebCore::ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseInsertionPoint):
Modify to consider insertion point's resetStyleInheritance.

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::createRendererForTextIfNeeded):
Since NodeRenderingContext has already found a parent node for
rendering and style and a parentRenderer is just the found node's
renderer, we have to only check reset-style-inheritance.
If reset, use default style. Otherwise, the parentRenderer's style.

• dom/Text.cpp:

(WebCore::Text::recalcTextStyle):
Use styleForText instead of parentRenderer's styles if the given text
node is a direct child of a shadow root or a direct child of a shadow
host.

LayoutTests:

• fast/dom/shadow/text-node-in-shadow-expected.html: Added.
• fast/dom/shadow/text-node-in-shadow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/text-node-in-shadow-expected.html (added)
• LayoutTests/fast/dom/shadow/text-node-in-shadow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (4 diffs)
• Source/WebCore/css/StyleResolver.h (modified) (1 diff)
• Source/WebCore/dom/ComposedShadowTreeWalker.cpp (modified) (1 diff)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (2 diffs)
• Source/WebCore/dom/Text.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-11  Takashi Sakamoto  <tasak@google.com>
+
+        Text nodes in shadow roots don't inherit style properly
+        https://bugs.webkit.org/show_bug.cgi?id=101116
+
+        Reviewed by Hajime Morita.
+
+        * fast/dom/shadow/text-node-in-shadow-expected.html: Added.
+        * fast/dom/shadow/text-node-in-shadow.html: Added.
+
 2012-12-11  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-11  Takashi Sakamoto  <tasak@google.com>
+
+        Text nodes in shadow roots don't inherit style properly
+        https://bugs.webkit.org/show_bug.cgi?id=101116
+
+        Reviewed by Hajime Morita.
+
+        Use NodeRenderingContext to resolve styles of text nodes.
+        If text nodes are direct children of shadow roots, the text nodes
+        should be inherited styles from their shadow hosts.
+        But if reset-style-inheritance flag is true, the text nodes should
+        not be inherited. And if text nodes are distributed nodes,
+        we have to check whether their insertion point's
+        reset-style-inheritance.
+        c.f. shadow dom spec is:
+        http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#styles
+
+        Test: fast/dom/shadow/text-node-in-shadow.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForElement):
+        Modified to use defaultStyleForElement if the given element has
+        no parent style.
+        (WebCore::StyleResolver::initForStyleResolve):
+        Removed shouldResetStyleInheritance, because now NodeRenderingContext
+        resetStyleInheritance() takes care of reset-style-inheritance of
+        both shadow roots and insertion points.
+        (WebCore::StyleResolver::defaultStyleForElement):
+        Added to create a default style for elements.
+        (WebCore):
+        (WebCore::StyleResolver::styleForText):
+        Use NodeRenderingContext to find the parent node for style from the
+        given text node. If no parent node is found or reset-style-inheritance
+        is true, returns a default style (i.e. empty render style).
+        Otherwise, just returns the found node's style.
+        * css/StyleResolver.h:
+        (StyleResolver):
+        * dom/ComposedShadowTreeWalker.cpp:
+        (WebCore::ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseInsertionPoint):
+        Modify to consider insertion point's resetStyleInheritance.
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::createRendererForTextIfNeeded):
+        Since NodeRenderingContext has already found a parent node for
+        rendering and style and a parentRenderer is just the found node's
+        renderer, we have to only check reset-style-inheritance.
+        If reset, use default style. Otherwise, the parentRenderer's style.
+        * dom/Text.cpp:
+        (WebCore::Text::recalcTextStyle):
+        Use styleForText instead of parentRenderer's styles if the given text
+        node is a direct child of a shadow root or a direct child of a shadow
+        host.
+
 2012-12-11  Takashi Sakamoto  <tasak@google.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -967 +967 @@
 }
 
-inline bool shouldResetStyleInheritance(NodeRenderingContext& context)
-{
-    if (context.resetStyleInheritance())
-        return true;
-
-    if (InsertionPoint* insertionPoint = context.insertionPoint())
-        return insertionPoint->resetStyleInheritance();
-
-    return false;
-}
-
 inline void StyleResolver::initForStyleResolve(Element* e, RenderStyle* parentStyle, PseudoId pseudoID)
 {
@@ -985 +974 @@
         NodeRenderingContext context(e);
         m_parentNode = context.parentNodeForRenderingAndStyle();
-        m_parentStyle = shouldResetStyleInheritance(context) ? 0 :
+        m_parentStyle = context.resetStyleInheritance() ? 0 :
             parentStyle ? parentStyle :
             m_parentNode ? m_parentNode->renderStyle() : 0;
@@ -1554 +1543 @@
     }
 
-    m_style = RenderStyle::create();
-
     RefPtr<RenderStyle> cloneForParent;
 
-    if (m_parentStyle)
+    if (m_parentStyle) {
+        m_style = RenderStyle::create();
         m_style->inheritFrom(m_parentStyle, isAtShadowBoundary(element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary);
-    else {
-        // Make sure our fonts are initialized if we don't inherit them from our parent style.
-        if (Settings* settings = documentSettings()) {
-            initializeFontStyle(settings);
-            m_style->font().update(fontSelector());
-        } else
-            m_style->font().update(0);
+    } else {
+        m_style = defaultStyleForElement();
         cloneForParent = RenderStyle::clone(style());
         m_parentStyle = cloneForParent.get();
@@ -1807 +1790 @@
     // Now return the style.
     return m_style.release();
+}
+
+PassRefPtr<RenderStyle> StyleResolver::defaultStyleForElement()
+{
+    m_style = RenderStyle::create();
+    // Make sure our fonts are initialized if we don't inherit them from our parent style.
+    if (Settings* settings = documentSettings()) {
+        initializeFontStyle(settings);
+        m_style->font().update(fontSelector());
+    } else
+        m_style->font().update(0);
+
+    return m_style.release();
+}
+
+PassRefPtr<RenderStyle> StyleResolver::styleForText(Text* textNode)
+{
+    ASSERT(textNode);
+
+    NodeRenderingContext context(textNode);
+    Node* parentNode = context.parentNodeForRenderingAndStyle();
+    return context.resetStyleInheritance() || !parentNode ?
+        defaultStyleForElement() : parentNode->renderStyle();
 }
 

trunk/Source/WebCore/css/StyleResolver.h

@@ -155 +155 @@
 
     PassRefPtr<RenderStyle> styleForPage(int pageIndex);
+    PassRefPtr<RenderStyle> defaultStyleForElement();
+    PassRefPtr<RenderStyle> styleForText(Text*);
 
     static PassRefPtr<RenderStyle> styleForDocument(Document*, CSSFontSelector* = 0);

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

@@ -73 +73 @@
 inline void ComposedShadowTreeWalker::ParentTraversalDetails::didTraverseInsertionPoint(InsertionPoint* insertionPoint)
 {
-    if (!m_insertionPoint)
+    if (!m_insertionPoint) {
         m_insertionPoint = insertionPoint;
+        m_resetStyleInheritance  = m_resetStyleInheritance || insertionPoint->resetStyleInheritance();
+    }
 }
 

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -45 +45 @@
 #include "ShadowRoot.h"
 #include "StyleInheritedData.h"
+#include "StyleResolver.h"
 #include "Text.h"
 
@@ -266 +267 @@
     if (!shouldCreateRenderer())
         return;
+
     RenderObject* parentRenderer = this->parentRenderer();
     ASSERT(parentRenderer);
-    m_style = parentRenderer->style();
+    Document* document = textNode->document();
+
+    if (resetStyleInheritance())
+        m_style = document->styleResolver()->defaultStyleForElement();
+    else
+        m_style = parentRenderer->style();
 
     if (!textNode->textRendererIsNeeded(*this))
         return;
-    Document* document = textNode->document();
     RenderText* newRenderer = textNode->createTextRenderer(document->renderArena(), m_style.get());
     if (!newRenderer)

trunk/Source/WebCore/dom/Text.cpp

@@ -34 +34 @@
 
 #include "StyleInheritedData.h"
+#include "StyleResolver.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
@@ -283 +284 @@
 {
     RenderText* renderer = toRenderText(this->renderer());
-    // The only time we have a renderer and our parent doesn't is if our parent
-    // is a shadow root.
-    if (change != NoChange && renderer) {
-        if (!parentNode()->isShadowRoot())
-            renderer->setStyle(parentNode()->renderer()->style());
-#if ENABLE(SVG)
-        else if (isSVGShadowText(this))
-            renderer->setStyle(toShadowRoot(parentNode())->host()->renderer()->style());
-#endif
-    }
+
+    if (change != NoChange && renderer)
+        renderer->setStyle(document()->styleResolver()->styleForText(this));
 
     if (needsStyleRecalc()) {