Changeset 253322 in webkit

Timestamp:

Dec 10, 2019, 6:34:42 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Fix fast/text/basic/005.html
​https://bugs.webkit.org/show_bug.cgi?id=205047
<rdar://problem/57780017>

Reviewed by Antti Koivisto.

Remove the code that triggers the assert on negative word-spacing.
Trimming is safe with negative values (and any negative trimmed width special handing should be in LineBreaker).

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::TrimmableContent::append):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLineBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-12-10  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Fix fast/text/basic/005.html
+        https://bugs.webkit.org/show_bug.cgi?id=205047
+        <rdar://problem/57780017>
+
+        Reviewed by Antti Koivisto.
+
+        Remove the code that triggers the assert on negative word-spacing.
+        Trimming is safe with negative values (and any negative trimmed width special handing should be in LineBreaker).
+
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::TrimmableContent::append):
+
 2019-12-10  Yusuke Suzuki  <ysuzuki@apple.com>
 

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

@@ -716 +716 @@
         trimmableWidth = trimmableRun.trailingLetterSpacing();
     }
-    // word-spacing could very well be negative, but it does not mean that the line gains that much extra space when the content is trimmed.
-    trimmableWidth = std::max<InlineLayoutUnit>(0, trimmableWidth);
-
-    ASSERT(trimmableWidth >= 0);
     m_width += trimmableWidth;
     m_lastRunIsFullyTrimmable = isFullyTrimmable;