Changeset 268821 in webkit

Timestamp:

Oct 21, 2020, 1:40:40 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Line may be able to fit some more content when the current candidate is trimmable
​https://bugs.webkit.org/show_bug.cgi?id=218044

Reviewed by Antti Koivisto.

This patch addresses the cases when the candidate content is partially/fully trimmable and
after putting the content on the line, there's still enough room to accommodate some more content.

• layout/inlineformatting/InlineContentBreaker.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Line may be able to fit some more content when the current candidate is trimmable
+        https://bugs.webkit.org/show_bug.cgi?id=218044
+
+        Reviewed by Antti Koivisto.
+
+        This patch addresses the cases when the candidate content is partially/fully trimmable and
+        after putting the content on the line, there's still enough room to accommodate some more content.  
+
+        * layout/inlineformatting/InlineContentBreaker.cpp:
+        (WebCore::Layout::InlineContentBreaker::processOverflowingContent const):
+
 2020-10-21  Chris Dumez  <cdumez@apple.com>
 

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

@@ -196 +196 @@
     if (continuousContent.hasTrailingCollapsibleContent()) {
         ASSERT(isTextContent(continuousContent));
-        auto IsEndOfLine = isContentWrappingAllowed(continuousContent) ? IsEndOfLine::Yes : IsEndOfLine::No;
         // First check if the content fits without the trailing collapsible part.
         if (continuousContent.nonCollapsibleLogicalWidth() <= lineStatus.availableWidth)
-            return { Result::Action::Keep, IsEndOfLine };
+            return { Result::Action::Keep, IsEndOfLine::No };
         // Now check if we can trim the line too.
         if (lineStatus.hasFullyCollapsibleTrailingRun && continuousContent.isFullyCollapsible()) {
             // If this new content is fully collapsible, it should surely fit.
-            return { Result::Action::Keep, IsEndOfLine };
+            return { Result::Action::Keep, IsEndOfLine::No };
         }
     } else if (lineStatus.collapsibleWidth && isNonContentRunsOnly(continuousContent)) {