Changeset 267596 in webkit

Timestamp:

Sep 25, 2020, 2:47:14 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Incorrect width value is set for partially collapsible trailing space
​https://bugs.webkit.org/show_bug.cgi?id=216990

Reviewed by Simon Fraser.

Source/WebCore:

Use the letter-spacing value as the collapsible space.

Test: fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::appendTextContent):

LayoutTests:

• fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html: Added.
• fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineLine.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Incorrect width value is set for partially collapsible trailing space
+        https://bugs.webkit.org/show_bug.cgi?id=216990
+
+        Reviewed by Simon Fraser.
+
+        * fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html: Added.
+        * fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html: Added.
+
 2020-09-25  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Incorrect width value is set for partially collapsible trailing space
+        https://bugs.webkit.org/show_bug.cgi?id=216990
+
+        Reviewed by Simon Fraser.
+
+        Use the letter-spacing value as the collapsible space.
+
+        Test: fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::appendTextContent):
+
 2020-09-25  James Darpinian  <jdarpinian@chromium.org>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp

@@ -317 +317 @@
     m_trimmableTrailingContent.reset();
     if (!formattingContext().layoutState().shouldIgnoreTrailingLetterSpacing() && !inlineTextItem.isWhitespace() && inlineTextItem.style().letterSpacing() > 0)
-        m_trimmableTrailingContent.addPartiallyTrimmableContent(m_runs.size() - 1, logicalWidth);
+        m_trimmableTrailingContent.addPartiallyTrimmableContent(m_runs.size() - 1, inlineTextItem.style().letterSpacing());
 }