Changeset 243605 in webkit

Timestamp:

Mar 28, 2019, 9:02:24 AM (7 years ago)

Author:

Alan Bujtas

Message:

[SimpleLineLayout] Disable SLL when text-underline-position is not auto.
​https://bugs.webkit.org/show_bug.cgi?id=196338
<rdar://problem/47975167>

Reviewed by Daniel Bates.

Source/WebCore:

Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.

Test: fast/text/simple-line-layout-with-text-underline-position.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseForStyle):

LayoutTests:

• fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
• fast/text/simple-line-layout-with-text-underline-position.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-28  Zalan Bujtas  <zalan@apple.com>
+
+        [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+        https://bugs.webkit.org/show_bug.cgi?id=196338
+        <rdar://problem/47975167>
+
+        Reviewed by Daniel Bates.
+
+        * fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
+        * fast/text/simple-line-layout-with-text-underline-position.html: Added.
+
 2019-03-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-28  Zalan Bujtas  <zalan@apple.com>
+
+        [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+        https://bugs.webkit.org/show_bug.cgi?id=196338
+        <rdar://problem/47975167>
+
+        Reviewed by Daniel Bates.
+
+        Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.
+
+        Test: fast/text/simple-line-layout-with-text-underline-position.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseForStyle):
+
 2019-03-28  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -202 +202 @@
     if (style.textOverflow() == TextOverflow::Ellipsis)
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextOverflow, reasons, includeReasons);
-    if ((style.textDecorationsInEffect() & TextDecoration::Underline) && (style.textUnderlinePosition() != TextUnderlinePosition::Auto || !style.textUnderlineOffset().isAuto() || !style.textDecorationThickness().isAuto()))
+    if (style.textUnderlinePosition() != TextUnderlinePosition::Auto || !style.textUnderlineOffset().isAuto() || !style.textDecorationThickness().isAuto())
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedUnderlineDecoration, reasons, includeReasons);
     // Non-visible overflow should be pretty easy to support.