Changeset 263853 in webkit

Timestamp:

Jul 2, 2020, 11:56:21 AM (6 years ago)

Author:

Antti Koivisto

Message:

REGRESSION: Comments section at dpreview has overlapping names with comment on phone
​https://bugs.webkit.org/show_bug.cgi?id=213890
Source/WebCore:

<rdar://problem/64693599>

Reviewed by Simon Fraser.

Test: fast/text-autosizing/ios/float-miscomputed-line-height.html

• rendering/TextAutoSizing.cpp:

(WebCore::TextAutoSizingValue::adjustTextNodeSizes):

Negative value is used to indicate unset line-height. We shouldn't make adjustments in this case.
This matches Style::BuilderCustom code.

LayoutTests:

Reviewed by Simon Fraser.

• fast/text-autosizing/ios/float-miscomputed-line-height-expected.html: Added.
• fast/text-autosizing/ios/float-miscomputed-line-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height-expected.html (added)
• LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/TextAutoSizing.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-07-02  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION: Comments section at dpreview has overlapping names with comment on phone
+        https://bugs.webkit.org/show_bug.cgi?id=213890
+
+        Reviewed by Simon Fraser.
+
+        * fast/text-autosizing/ios/float-miscomputed-line-height-expected.html: Added.
+        * fast/text-autosizing/ios/float-miscomputed-line-height.html: Added.
+
 2020-07-02  Karl Rackler  <rackler@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-02  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION: Comments section at dpreview has overlapping names with comment on phone
+        https://bugs.webkit.org/show_bug.cgi?id=213890
+        <rdar://problem/64693599>
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/text-autosizing/ios/float-miscomputed-line-height.html
+
+        * rendering/TextAutoSizing.cpp:
+        (WebCore::TextAutoSizingValue::adjustTextNodeSizes):
+
+        Negative value is used to indicate unset line-height. We shouldn't make adjustments in this case.
+        This matches Style::BuilderCustom code.
+
 2020-07-02  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/TextAutoSizing.cpp

@@ -155 +155 @@
 
         auto newParentStyle = cloneRenderStyleWithState(parentStyle);
-        newParentStyle.setLineHeight(Length(lineHeight, Fixed));
+        newParentStyle.setLineHeight(lineHeightLength.isNegative() ? Length(lineHeightLength) : Length(lineHeight, Fixed));
         newParentStyle.setSpecifiedLineHeight(Length { lineHeightLength });
         newParentStyle.setFontDescription(WTFMove(fontDescription));