Changeset 246476 in webkit

Timestamp:

Jun 16, 2019, 12:30:15 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Completely collapsed runs should not go to the trimmable run list.
​https://bugs.webkit.org/show_bug.cgi?id=198900
<rdar://problem/51782156>

Reviewed by Antti Koivisto.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::trailingTrimmableWidth const):
(WebCore::Layout::Line::appendTextContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Completely collapsed runs should not go to the trimmable run list.
+        https://bugs.webkit.org/show_bug.cgi?id=198900
+        <rdar://problem/51782156>
+
+        Reviewed by Antti Koivisto.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::trailingTrimmableWidth const):
+        (WebCore::Layout::Line::appendTextContent):
+
 2019-06-16  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -160 +160 @@
 {
     LayoutUnit trimmableWidth;
-    for (auto* trimmableRun : m_trimmableContent)
+    for (auto* trimmableRun : m_trimmableContent) {
+        ASSERT(!trimmableRun->isCollapsed);
         trimmableWidth += trimmableRun->logicalRect.width();
+    }
     return trimmableWidth;
 }
@@ -229 +231 @@
     auto textContext = Content::Run::TextContext { inlineItem.start(), inlineItem.isCollapsed() ? 1 : inlineItem.length() };
     auto lineItem = std::make_unique<Content::Run>(inlineItem, logicalRect, textContext, isCompletelyCollapsed, canBeExtended);
-    if (isTrimmable)
+    if (isTrimmable && !isCompletelyCollapsed)
         m_trimmableContent.add(lineItem.get());