Changeset 253004 in webkit

Timestamp:

Dec 2, 2019 12:16:07 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Adjust trailing runs horizontally while trimming content
​https://bugs.webkit.org/show_bug.cgi?id=204749
<rdar://problem/57559163>

Reviewed by Antti Koivisto.

When trailing content is getting trimmed, we also need to adjust subsequent trailing runs e.g. <span> </span> <- the [container end]'s run should be adjusted.

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::removeTrailingTrimmableContent):
(WebCore::Layout::LineBuilder::appendTextContent): there's nothing to trim when the spacing is zero or negative.

• layout/inlineformatting/InlineLineBuilder.h:

(WebCore::Layout::LineBuilder::InlineItemRun::moveHorizontally):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLineBuilder.cpp (modified) (3 diffs)
• layout/inlineformatting/InlineLineBuilder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-12-02  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Adjust trailing runs horizontally while trimming content
+        https://bugs.webkit.org/show_bug.cgi?id=204749
+        <rdar://problem/57559163>
+
+        Reviewed by Antti Koivisto.
+
+        When trailing content is getting trimmed, we also need to adjust subsequent trailing runs e.g. <span>   </span> <- the [container end]'s run should be adjusted. 
+
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::removeTrailingTrimmableContent):
+        (WebCore::Layout::LineBuilder::appendTextContent): there's nothing to trim when the spacing is zero or negative.
+        * layout/inlineformatting/InlineLineBuilder.h:
+        (WebCore::Layout::LineBuilder::InlineItemRun::moveHorizontally):
+
 2019-12-02  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -377 +377 @@
     auto hasSeenNonWhitespaceTextContent = false;
 #endif
-    // Collapse trimmable trailing content.
+    // Collapse trimmable trailing content and move all the other trailing runs.
+    // <span> </span><span></span> ->
+    // [whitespace][container end][container start][container end]
+    // Trim the whitespace run and move the trailing inline container runs to the left.
+    LayoutUnit accumulatedTrimmedWidth;
     for (auto index = *m_trimmableContent.firstRunIndex(); index < m_inlineItemRuns.size(); ++index) {
         auto& run = m_inlineItemRuns[index];
+        run.moveHorizontally(-accumulatedTrimmedWidth);
         if (!run.isText()) {
             ASSERT(run.isContainerStart() || run.isContainerEnd() || run.isForcedLineBreak());
             continue;
         }
-        if (run.isWhitespace())
+        if (run.isWhitespace()) {
+            accumulatedTrimmedWidth += run.logicalWidth();
             run.setCollapsesToZeroAdvanceWidth();
-        else {
+        } else {
             ASSERT(!hasSeenNonWhitespaceTextContent);
 #ifndef NDEBUG
@@ -392 +398 @@
 #endif
             // Must be a letter spacing trim.
-            ASSERT(run.layoutBox().style().letterSpacing());
+            ASSERT(run.layoutBox().style().letterSpacing() > 0);
+            accumulatedTrimmedWidth += run.layoutBox().style().letterSpacing();
             run.removeTrailingLetterSpacing();
         }
     }
+    ASSERT(accumulatedTrimmedWidth == m_trimmableContent.width());
     m_lineBox.shrinkHorizontally(m_trimmableContent.width());
     m_trimmableContent.clear();
@@ -518 +526 @@
     // Trailing whitespace content is fully trimmable so as the trailing letter space.
     auto isFullyTrimmable = !shouldPreserveTrailingContent(inlineItem);
-    auto isPartiallyTrimmable = !inlineItem.isWhitespace() && inlineItem.style().letterSpacing();
+    auto isPartiallyTrimmable = !inlineItem.isWhitespace() && inlineItem.style().letterSpacing() > 0;
     auto isTrimmable = isFullyTrimmable || isPartiallyTrimmable;
     // Reset the trimmable content if needed.

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

@@ -173 +173 @@
         bool isCollapsed() const { return m_isCollapsed; }
 
+        void moveHorizontally(LayoutUnit offset) { m_logicalWidth += offset; }
+
         void removeTrailingLetterSpacing();
         void setCollapsesToZeroAdvanceWidth();