Changeset 272649 in webkit

Timestamp:

Feb 10, 2021, 6:59:20 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Pass in sane content width values to InlineContentBreaker
​https://bugs.webkit.org/show_bug.cgi?id=221628
Source/WebCore:

rdar://problem/73874164

Reviewed by Antti Koivisto.

Insanely large zoom value could produce Nan letter-spacing values.
Let's tighten the inline content width values so that InlineContentBreaker can always expect valid InlineLayoutUnit values.

Test: fast/text/letter-spacing-produces-nan-width.html

• layout/inlineformatting/InlineContentBreaker.cpp:

(WebCore::Layout::InlineContentBreaker::ContinuousContent::append):

• layout/inlineformatting/text/TextUtil.cpp:

(WebCore::Layout::TextUtil::width):

LayoutTests:

Reviewed by Antti Koivisto.

• fast/text/letter-spacing-produces-nan-width-expected.txt: Added.
• fast/text/letter-spacing-produces-nan-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/letter-spacing-produces-nan-width-expected.txt (added)
• LayoutTests/fast/text/letter-spacing-produces-nan-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/text/TextUtil.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-10  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Pass in sane content width values to InlineContentBreaker
+        https://bugs.webkit.org/show_bug.cgi?id=221628
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/letter-spacing-produces-nan-width-expected.txt: Added.
+        * fast/text/letter-spacing-produces-nan-width.html: Added.
+
 2021-02-10  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-10  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Pass in sane content width values to InlineContentBreaker
+        https://bugs.webkit.org/show_bug.cgi?id=221628
+        rdar://problem/73874164
+
+        Reviewed by Antti Koivisto.
+
+        Insanely large zoom value could produce Nan letter-spacing values.
+        Let's tighten the inline content width values so that InlineContentBreaker can always expect valid InlineLayoutUnit values.
+
+        Test: fast/text/letter-spacing-produces-nan-width.html
+
+        * layout/inlineformatting/InlineContentBreaker.cpp:
+        (WebCore::Layout::InlineContentBreaker::ContinuousContent::append):
+        * layout/inlineformatting/text/TextUtil.cpp:
+        (WebCore::Layout::TextUtil::width):
+
 2021-02-10  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -489 +489 @@
 {
     m_runs.append({ inlineItem, logicalWidth });
-    m_logicalWidth += logicalWidth;
+    m_logicalWidth = clampTo<InlineLayoutUnit>(m_logicalWidth + logicalWidth);
     if (!collapsibleWidth) {
         m_collapsibleLogicalWidth = { };

trunk/Source/WebCore/layout/inlineformatting/text/TextUtil.cpp

@@ -48 +48 @@
     RELEASE_ASSERT(from >= inlineTextItem.start());
     RELEASE_ASSERT(to <= inlineTextItem.end());
-    if (inlineTextItem.isWhitespace() && !InlineTextItem::shouldPreserveSpacesAndTabs(inlineTextItem))
-        return inlineTextItem.style().fontCascade().spaceWidth();
+    if (inlineTextItem.isWhitespace() && !InlineTextItem::shouldPreserveSpacesAndTabs(inlineTextItem)) {
+        auto spaceWidth = inlineTextItem.style().fontCascade().spaceWidth();
+        return std::isnan(spaceWidth) ? 0.0f : std::isinf(spaceWidth) ? maxInlineLayoutUnit() : spaceWidth;
+    }
     return TextUtil::width(inlineTextItem.inlineTextBox(), from, to, contentLogicalLeft);
 }
@@ -80 +82 @@
         width -= (font.spaceWidth() + font.wordSpacing());
 
-    return width;
+    return std::isnan(width) ? 0.0f : std::isinf(width) ? maxInlineLayoutUnit() : width;
 }