Changeset 283477 in webkit

Timestamp:

Oct 3, 2021, 12:32:52 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Line functions can compute the "extra horizontal space"
​https://bugs.webkit.org/show_bug.cgi?id=231127

Reviewed by Antti Koivisto.

This is in preparation for making applyRunExpansion hanging whitespace aware.

• layout/formattingContexts/inline/InlineLine.cpp:

(WebCore::Layout::Line::removeCollapsibleContent):
(WebCore::Layout::Line::applyRunExpansion):
(WebCore::Layout::Line::visuallyCollapseHangingOverflow):

• 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) (5 diffs)
• layout/formattingContexts/inline/InlineLine.h (modified) (2 diffs)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-03  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Line functions can compute the "extra horizontal space"
+        https://bugs.webkit.org/show_bug.cgi?id=231127
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for making applyRunExpansion hanging whitespace aware.
+
+        * layout/formattingContexts/inline/InlineLine.cpp:
+        (WebCore::Layout::Line::removeCollapsibleContent):
+        (WebCore::Layout::Line::applyRunExpansion):
+        (WebCore::Layout::Line::visuallyCollapseHangingOverflow):
+        * layout/formattingContexts/inline/InlineLine.h:
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::close):
+
 2021-10-03  Alan Bujtas  <zalan@apple.com>
 

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

@@ -61 +61 @@
 }
 
-void Line::removeCollapsibleContent(InlineLayoutUnit extraHorizontalSpace)
+void Line::removeCollapsibleContent(InlineLayoutUnit horizontalAvailableSpace)
 {
     removeTrailingTrimmableContent();
-    visuallyCollapseHangingOverflow(extraHorizontalSpace);
-}
-
-void Line::applyRunExpansion(InlineLayoutUnit extraHorizontalSpace)
+    visuallyCollapseHangingOverflow(horizontalAvailableSpace);
+}
+
+void Line::applyRunExpansion(InlineLayoutUnit horizontalAvailableSpace)
 {
     ASSERT(formattingContext().root().style().textAlign() == TextAlignMode::Justify);
@@ -76 +76 @@
         return;
     // Anything to distribute?
-    if (!extraHorizontalSpace)
+    auto spaceToDistribute = horizontalAvailableSpace - contentLogicalWidth();
+    if (spaceToDistribute <= 0)
         return;
 
@@ -126 +127 @@
         return;
     // Distribute the extra space.
-    auto expansionToDistribute = extraHorizontalSpace / lineExpansionOpportunities;
+    auto expansionToDistribute = spaceToDistribute / lineExpansionOpportunities;
     auto accumulatedExpansion = InlineLayoutUnit { };
     for (size_t runIndex = 0; runIndex < m_runs.size(); ++runIndex) {
@@ -164 +165 @@
 }
 
-void Line::visuallyCollapseHangingOverflow(InlineLayoutUnit extraHorizontalSpace)
+void Line::visuallyCollapseHangingOverflow(InlineLayoutUnit horizontalAvailableSpace)
 {
     ASSERT(m_trimmableTrailingContent.isEmpty());
@@ -170 +171 @@
     // ...
     // It may also visually collapse the character advance widths of any that would otherwise overflow.
-    auto overflowWidth = -extraHorizontalSpace;
+    auto overflowWidth = contentLogicalWidth() - horizontalAvailableSpace;
     if (overflowWidth <= 0)
         return;

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

@@ -59 +59 @@
     void addTrailingHyphen(InlineLayoutUnit hyphenLogicalWidth);
 
-    void removeCollapsibleContent(InlineLayoutUnit extraHorizontalSpace);
-    void applyRunExpansion(InlineLayoutUnit extraHorizontalSpace);
+    void removeCollapsibleContent(InlineLayoutUnit horizontalAvailableSpace);
+    void applyRunExpansion(InlineLayoutUnit horizontalAvailableSpace);
 
     struct Run {
@@ -155 +155 @@
 
     void removeTrailingTrimmableContent();
-    void visuallyCollapseHangingOverflow(InlineLayoutUnit extraHorizontalSpace);
+    void visuallyCollapseHangingOverflow(InlineLayoutUnit horizontalAvailableSpace);
 
     const InlineFormattingContext& formattingContext() const;

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

@@ -373 +373 @@
         return lineRange;
     }
-    auto availableWidth = m_lineLogicalRect.width() - m_line.contentLogicalRight();
-    m_line.removeCollapsibleContent(availableWidth);
+    auto horizontalAvailableSpace = m_lineLogicalRect.width();
+    m_line.removeCollapsibleContent(horizontalAvailableSpace);
     auto horizontalAlignment = root().style().textAlign();
     auto runsExpandHorizontally = horizontalAlignment == TextAlignMode::Justify && !isLastLineWithInlineContent(lineRange, needsLayoutRange.end, committedContent.partialTrailingContentLength);
     if (runsExpandHorizontally)
-        m_line.applyRunExpansion(m_lineLogicalRect.width() - m_line.contentLogicalRight());
+        m_line.applyRunExpansion(horizontalAvailableSpace);
     auto lineEndsWithHyphen = false;
     if (!m_line.runs().isEmpty()) {