Changeset 286001 in webkit

Timestamp:

Nov 18, 2021, 6:54:14 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Should not always keep the entire continuous content when the line is empty
​https://bugs.webkit.org/show_bug.cgi?id=233303

Reviewed by Antti Koivisto.

The rule of "let's keep the first glyph on the line" should take into account when
the continuous content has a series of runs e.g [X][X][X] where each 'X' represents an individual inline text item.
In such cases we should just return the first text run as the trailing inline item with 'break' action.
(This patch is in preparation for enabling IFC's preferred width computation.)

• layout/formattingContexts/inline/InlineContentBreaker.cpp:

(WebCore::Layout::InlineContentBreaker::processOverflowingContent const):

• rendering/RenderBlockFlow.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineContentBreaker.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-18  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Should not always keep the entire continuous content when the line is empty
+        https://bugs.webkit.org/show_bug.cgi?id=233303
+
+        Reviewed by Antti Koivisto.
+
+        The rule of "let's keep the first glyph on the line" should take into account when
+        the continuous content has a series of runs e.g [X][X][X] where each 'X' represents an individual inline text item.
+        In such cases we should just return the first text run as the trailing inline item with 'break' action.
+        (This patch is in preparation for enabling IFC's preferred width computation.)
+
+        * layout/formattingContexts/inline/InlineContentBreaker.cpp:
+        (WebCore::Layout::InlineContentBreaker::processOverflowingContent const):
+        * rendering/RenderBlockFlow.cpp:
+
 2021-11-18  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp

@@ -222 +222 @@
                 }();
 
-                if (inlineTextItem.length() <= firstCodePointLength)
-                    return Result { Result::Action::Keep, IsEndOfLine::Yes };
+                if (inlineTextItem.length() <= firstCodePointLength) {
+                    if (continuousContent.runs().size() == 1) {
+                        // Let's return single, leading text items as is.
+                        return Result { Result::Action::Keep, IsEndOfLine::Yes };
+                    }
+                    return Result { Result::Action::Break, IsEndOfLine::Yes, Result::PartialTrailingContent { leadingTextRunIndex, { } } };
+                }
 
                 auto firstCodePointWidth = TextUtil::width(inlineTextItem, leadingTextRun.style.fontCascade(), inlineTextItem.start(), inlineTextItem.start() + firstCodePointLength, lineStatus.contentLogicalRight);