Changeset 285926 in webkit

Timestamp:

Nov 17, 2021, 6:23:40 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] LineBuilder should drive the trailing whitespace collapsing/trimming
​https://bugs.webkit.org/show_bug.cgi?id=233233

Reviewed by Antti Koivisto.

This is in preparation for adding min/max intrinsic handling to trailing whitespace content.

• layout/formattingContexts/inline/InlineLine.cpp:

(WebCore::Layout::Line::visuallyCollapseHangingOverflowingWhitespace): Use spec term.
(WebCore::Layout::Line::removeTrimmableContent): Deleted.
(WebCore::Layout::Line::visuallyCollapseHangingOverflow): Deleted.

• layout/formattingContexts/inline/InlineLine.h:
• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::close):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLine.cpp (modified) (2 diffs)
• layout/formattingContexts/inline/InlineLine.h (modified) (2 diffs)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-17  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] LineBuilder should drive the trailing whitespace collapsing/trimming
+        https://bugs.webkit.org/show_bug.cgi?id=233233
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for adding min/max intrinsic handling to trailing whitespace content.
+
+        * layout/formattingContexts/inline/InlineLine.cpp:
+        (WebCore::Layout::Line::visuallyCollapseHangingOverflowingWhitespace): Use spec term.
+        (WebCore::Layout::Line::removeTrimmableContent): Deleted.
+        (WebCore::Layout::Line::visuallyCollapseHangingOverflow): Deleted.
+        * layout/formattingContexts/inline/InlineLine.h:
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::close):
+
 2021-11-17  Alan Bujtas  <zalan@apple.com>
 

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

@@ -91 +91 @@
 }
 
-void Line::removeTrimmableContent(InlineLayoutUnit horizontalAvailableSpace)
-{
-    removeTrailingTrimmableContent();
-    visuallyCollapseHangingOverflow(horizontalAvailableSpace);
-}
-
 void Line::applyRunExpansion(InlineLayoutUnit horizontalAvailableSpace)
 {
@@ -203 +197 @@
 }
 
-void Line::visuallyCollapseHangingOverflow(InlineLayoutUnit horizontalAvailableSpace)
+void Line::visuallyCollapseHangingOverflowingGlyphs(InlineLayoutUnit horizontalAvailableSpace)
 {
     ASSERT(m_trimmableTrailingContent.isEmpty());

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.h

@@ -64 +64 @@
     void addTrailingHyphen(InlineLayoutUnit hyphenLogicalWidth);
 
-    void removeTrimmableContent(InlineLayoutUnit horizontalAvailableSpace);
+    void removeTrailingTrimmableContent();
+    void visuallyCollapseHangingOverflowingGlyphs(InlineLayoutUnit horizontalAvailableSpace);
     void applyRunExpansion(InlineLayoutUnit horizontalAvailableSpace);
 
@@ -179 +180 @@
     InlineLayoutUnit addBorderAndPaddingEndForInlineBoxDecorationClone(const InlineItem& inlineBoxStartItem);
     InlineLayoutUnit removeBorderAndPaddingEndForInlineBoxDecorationClone(const InlineItem& inlineBoxEndItem);
-    void removeTrailingTrimmableContent();
-    void visuallyCollapseHangingOverflow(InlineLayoutUnit horizontalAvailableSpace);
 
     void resetTrailingContent();

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

@@ -458 +458 @@
     }
     auto horizontalAvailableSpace = m_lineLogicalRect.width();
-    m_line.removeTrimmableContent(horizontalAvailableSpace);
+    m_line.removeTrailingTrimmableContent();
+    m_line.visuallyCollapseHangingOverflowingGlyphs(horizontalAvailableSpace);
     auto horizontalAlignment = root().style().textAlign();
     auto runsExpandHorizontally = horizontalAlignment == TextAlignMode::Justify && !isLastLineWithInlineContent(lineRange, needsLayoutRange.end, committedContent.partialTrailingContentLength);