Changeset 267617 in webkit

Timestamp:

Sep 25, 2020, 10:21:18 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Incorrect breaking position when inline box content fits the line but the inline content itself does not.
​https://bugs.webkit.org/show_bug.cgi?id=217007

Reviewed by Simon Fraser.

Source/WebCore:

When the inline box does not fit the line but its text content does, the last breaking opportunity (in case of arbitrary breaking position)
is not the end of the text.
e.g
<div style="width: 200px; word-break: break-word;"><span style="border-right: 100px;">text_content_fits</span></div>
in this case the border right overflows the containing block and should be wrapped to the next available vertical position.
However the last breaking opportunity is not between 's' and the </span> but between 't' and 's'.

Test: fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not.html

• layout/inlineformatting/InlineLineBreaker.cpp:

(WebCore::Layout::LineBreaker::tryBreakingTextRun const):

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineCandidate::InlineContent::appendInlineItem): [container start](<span>) and [container end](</span>) runs are not collapsible.

LayoutTests:

• fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not-expected.html: Added.
• fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Incorrect breaking position when inline box content fits the line but the inline content itself does not.
+        https://bugs.webkit.org/show_bug.cgi?id=217007
+
+        Reviewed by Simon Fraser.
+
+        * fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not-expected.html: Added.
+        * fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not.html: Added.
+
 2020-09-25  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Incorrect breaking position when inline box content fits the line but the inline content itself does not.
+        https://bugs.webkit.org/show_bug.cgi?id=217007
+
+        Reviewed by Simon Fraser.
+
+        When the inline box does not fit the line but its text content does, the last breaking opportunity (in case of arbitrary breaking position)
+        is not the end of the text.
+        e.g
+        <div style="width: 200px; word-break: break-word;"><span style="border-right: 100px;">text_content_fits</span></div>
+        in this case the border right overflows the containing block and should be wrapped to the next available vertical position.
+        However the last breaking opportunity is not between 's' and the </span> but between 't' and 's'.
+
+        Test: fast/layoutformattingcontext/inlin-box-content-fits-but-the-box-does-not.html
+
+        * layout/inlineformatting/InlineLineBreaker.cpp:
+        (WebCore::Layout::LineBreaker::tryBreakingTextRun const):
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineCandidate::InlineContent::appendInlineItem): [container start](<span>) and [container end](</span>) runs are not collapsible.
+
 2020-09-25  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -302 +302 @@
             // When the run can be split at arbitrary position,
             // let's just return the entire run when it is intended to fit on the line.
-            return PartialRun { inlineTextItem.length(), overflowRun.logicalWidth, false };
+            ASSERT(inlineTextItem.length());
+            auto trailingPartialRunWidth = TextUtil::width(inlineTextItem, inlineTextItem.start(), inlineTextItem.end() - 1, logicalLeft);
+            return PartialRun { inlineTextItem.length() - 1, trailingPartialRunWidth, false };
         }
         auto splitData = TextUtil::split(inlineTextItem.inlineTextBox(), inlineTextItem.start(), inlineTextItem.length(), overflowRun.logicalWidth, availableWidth, logicalLeft);

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

@@ -248 +248 @@
             return inlineTextItem.isWhitespace() && !TextUtil::shouldPreserveTrailingWhitespace(inlineTextItem.style());
         }
+        if (inlineItem.isContainerStart() || inlineItem.isContainerEnd())
+            return false;
+        ASSERT_NOT_REACHED();
         return true;
     };