Changeset 278602 in webkit

Timestamp:

Jun 8, 2021 5:11:32 AM (14 months ago)

Author:

Antti Koivisto

Message:

text-decoration: underline is not applied to web component
​https://bugs.webkit.org/show_bug.cgi?id=226724
<rdar://problem/78987286>

Reviewed by Ryosuke Niwa.

Source/WebCore:

'text-decoration' is not an inherited property in itself but its effective value
behaves as it was. We fail to inherit this effective value into author shadow trees.

Test case by Jeroen Zwartepoorte.

Test: fast/shadow-dom/effective-text-decoration-inheritance.html

• style/StyleAdjuster.cpp:

(WebCore::Style::shouldInheritEffectiveTextDecorations):

Test for user agent shadow tree, not a shadow tree in general.
Also inverse the logic and refactor a bit.

(WebCore::Style::Adjuster::adjust const):
(WebCore::Style::isAtShadowBoundary): Deleted.
(WebCore::Style::doesNotInheritTextDecoration): Deleted.

LayoutTests:

• fast/shadow-dom/effective-text-decoration-inheritance-expected.html: Added.
• fast/shadow-dom/effective-text-decoration-inheritance.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/effective-text-decoration-inheritance-expected.html (added)
• LayoutTests/fast/shadow-dom/effective-text-decoration-inheritance.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleAdjuster.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-08  Antti Koivisto  <antti@apple.com>
+
+        `text-decoration: underline` is not applied to web component
+        https://bugs.webkit.org/show_bug.cgi?id=226724
+        <rdar://problem/78987286>
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/shadow-dom/effective-text-decoration-inheritance-expected.html: Added.
+        * fast/shadow-dom/effective-text-decoration-inheritance.html: Added.
+
 2021-06-08  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-08  Antti Koivisto  <antti@apple.com>
+
+        `text-decoration: underline` is not applied to web component
+        https://bugs.webkit.org/show_bug.cgi?id=226724
+        <rdar://problem/78987286>
+
+        Reviewed by Ryosuke Niwa.
+
+        'text-decoration' is not an inherited property in itself but its effective value
+        behaves as it was. We fail to inherit this effective value into author shadow trees.
+
+        Test case by Jeroen Zwartepoorte.
+
+        Test: fast/shadow-dom/effective-text-decoration-inheritance.html
+
+        * style/StyleAdjuster.cpp:
+        (WebCore::Style::shouldInheritEffectiveTextDecorations):
+
+        Test for user agent shadow tree, not a shadow tree in general.
+        Also inverse the logic and refactor a bit.
+
+        (WebCore::Style::Adjuster::adjust const):
+        (WebCore::Style::isAtShadowBoundary): Deleted.
+        (WebCore::Style::doesNotInheritTextDecoration): Deleted.
+
 2021-06-08  Frédéric Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/style/StyleAdjuster.cpp

@@ -142 +142 @@
 }
 
-static inline bool isAtShadowBoundary(const Element& element)
-{
-    auto* parentNode = element.parentNode();
-    return parentNode && parentNode->isShadowRoot();
-}
-
-// CSS requires text-decoration to be reset at each DOM element for tables,
-// inline blocks, inline tables, shadow DOM crossings, floating elements,
-// and absolute or relatively positioned elements.
-static bool doesNotInheritTextDecoration(const RenderStyle& style, const Element* element)
-{
-    return style.display() == DisplayType::Table || style.display() == DisplayType::InlineTable
-        || style.display() == DisplayType::InlineBlock || style.display() == DisplayType::InlineBox || (element && isAtShadowBoundary(*element))
-        || style.isFloating() || style.hasOutOfFlowPosition();
+static bool shouldInheritTextDecorationsInEffect(const RenderStyle& style, const Element* element)
+{
+    if (style.isFloating() || style.hasOutOfFlowPosition())
+        return false;
+
+    auto isAtUserAgentShadowBoundary = [&] {
+        if (!element)
+            return false;
+        auto* parentNode = element->parentNode();
+        return parentNode && parentNode->isUserAgentShadowRoot();
+    }();
+
+    // There is no other good way to prevent decorations from affecting user agent shadow trees.
+    if (isAtUserAgentShadowBoundary)
+        return false;
+
+    switch (style.display()) {
+    case DisplayType::Table:
+    case DisplayType::InlineTable:
+    case DisplayType::InlineBlock:
+    case DisplayType::InlineBox:
+        return false;
+    default:
+        break;
+    };
+
+    return true;
 }
 
@@ -394 +407 @@
     }
 
-    if (doesNotInheritTextDecoration(style, m_element))
+    if (shouldInheritTextDecorationsInEffect(style, m_element))
+        style.addToTextDecorationsInEffect(style.textDecoration());
+    else
         style.setTextDecorationsInEffect(style.textDecoration());
-    else
-        style.addToTextDecorationsInEffect(style.textDecoration());
 
     // If either overflow value is not visible, change to auto.