Changeset 219543 in webkit

Timestamp:

Jul 15, 2017 10:52:30 PM (7 years ago)

Author:

mmaxfield@apple.com

Message:

line-height: <number> gets visually applied twice when text autosizing is in effect
​https://bugs.webkit.org/show_bug.cgi?id=174536
<rdar://problem/33338259>

Reviewed by Simon Fraser.

Source/WebCore:

StyleBuilderConverter::convertLineHeight() converts line-height: <number> into a
"percentage" length. Then, when layout needs to know what the computed value of
line-height is, RenderStyle::computedLineHeight() multiplies this percentage by
the computed font size.

With autosizing, the computed font size already incorporates the autosizing
multiplier, so we shouldn't also incorporate this multiplier into the percentage
value itself. getComputedStyle()'s lineHeightFromStyle() was compensating for
this double application by multiplying the percentage by the font-size's specified
value instead of its computed value, which is incorrect.

Test: fast/text-autosizing/line-height-number.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::lineHeightFromStyle):

• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertLineHeight):

LayoutTests:

• fast/text-autosizing/line-height-number-expected.html: Added.
• fast/text-autosizing/line-height-number.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text-autosizing/line-height-number-expected.html (added)
• LayoutTests/fast/text-autosizing/line-height-number.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/css/StyleBuilderConverter.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-15  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        line-height: <number> gets visually applied twice when text autosizing is in effect
+        https://bugs.webkit.org/show_bug.cgi?id=174536
+        <rdar://problem/33338259>
+
+        Reviewed by Simon Fraser.
+
+        * fast/text-autosizing/line-height-number-expected.html: Added.
+        * fast/text-autosizing/line-height-number.html: Added.
+
 2017-07-14  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-15  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        line-height: <number> gets visually applied twice when text autosizing is in effect
+        https://bugs.webkit.org/show_bug.cgi?id=174536
+        <rdar://problem/33338259>
+
+        Reviewed by Simon Fraser.
+
+        StyleBuilderConverter::convertLineHeight() converts line-height: <number> into a
+        "percentage" length. Then, when layout needs to know what the computed value of
+        line-height is, RenderStyle::computedLineHeight() multiplies this percentage by
+        the computed font size.
+
+        With autosizing, the computed font size already incorporates the autosizing
+        multiplier, so we shouldn't also incorporate this multiplier into the percentage
+        value itself. getComputedStyle()'s lineHeightFromStyle() was compensating for
+        this double application by multiplying the percentage by the font-size's specified
+        value instead of its computed value, which is incorrect.
+
+        Test: fast/text-autosizing/line-height-number.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::lineHeightFromStyle):
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertLineHeight):
+
 2017-07-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1972 +1972 @@
         // On the other hand, since font-size doesn't include the zoom factor, we really can't do
         // that here either.
-        return zoomAdjustedPixelValue(static_cast<int>(length.percent() * style.fontDescription().specifiedSize()) / 100, style);
+        return zoomAdjustedPixelValue(static_cast<int>(length.percent() * style.fontDescription().computedSize()) / 100, style);
     }
     return zoomAdjustedPixelValue(floatValueForLength(length, 0), style);

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -1447 +1447 @@
     }
     if (primitiveValue.isNumber())
-        return Length(primitiveValue.doubleValue() * multiplier * 100.0, Percent);
+        return Length(primitiveValue.doubleValue() * 100.0, Percent);
 
     // FIXME: The parser should only emit the above types, so this should never be reached. We should change the