Changeset 198858 in webkit

Timestamp:

Mar 30, 2016 3:06:38 PM (8 years ago)

Author:

weinig@apple.com

Message:

-webkit-text-underline-position: under; does not work in ToT
​https://bugs.webkit.org/show_bug.cgi?id=156038

Reviewed by David Hyatt.

Source/WebCore:

Test: fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic.html

• style/InlineTextBoxStyle.cpp:

(WebCore::computeUnderlineOffset):
Only resolve the underline position when based on the InlineTextBox when it is specified as auto.

LayoutTests:

• fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic-expected-mismatch.html: Added.
• fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic.html: Added.

Add mismatch test to show that -webkit-text-underline-position: under works.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic-expected-mismatch.html (added)
• LayoutTests/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/InlineTextBoxStyle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-03-30  Sam Weinig  <sam@webkit.org>
+
+        -webkit-text-underline-position: under; does not work in ToT
+        https://bugs.webkit.org/show_bug.cgi?id=156038
+
+        Reviewed by David Hyatt.
+
+        * fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic-expected-mismatch.html: Added.
+        * fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic.html: Added.
+        Add mismatch test to show that -webkit-text-underline-position: under works.
+
 2016-03-30  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-03-30  Sam Weinig  <sam@webkit.org>
+
+        -webkit-text-underline-position: under; does not work in ToT
+        https://bugs.webkit.org/show_bug.cgi?id=156038
+
+        Reviewed by David Hyatt.
+
+        Test: fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under-vs-alphabetic.html
+
+        * style/InlineTextBoxStyle.cpp:
+        (WebCore::computeUnderlineOffset):
+        Only resolve the underline position when based on the InlineTextBox when it is specified as auto.
+
 2016-03-30  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/style/InlineTextBoxStyle.cpp

@@ -47 +47 @@
     // vertical text, since we already determined the baseline type to be ideographic in that
     // case.
-    TextUnderlinePosition resolvedUnderlinePosition = underlinePosition == TextUnderlinePositionAuto && inlineTextBox && inlineTextBox->root().baselineType() == IdeographicBaseline ? TextUnderlinePositionUnder : TextUnderlinePositionAlphabetic;
+    
+    TextUnderlinePosition resolvedUnderlinePosition = underlinePosition;
+    if (resolvedUnderlinePosition == TextUnderlinePositionAuto) {
+        if (inlineTextBox)
+            resolvedUnderlinePosition = inlineTextBox->root().baselineType() == IdeographicBaseline ? TextUnderlinePositionUnder : TextUnderlinePositionAlphabetic;
+        else
+            resolvedUnderlinePosition = TextUnderlinePositionAlphabetic;
+    }
     
     switch (resolvedUnderlinePosition) {