Changeset 251846 in webkit

Timestamp:

Oct 31, 2019 8:16:42 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Set setIsCollapsed on the line item when its content is actually collapsed
​https://bugs.webkit.org/show_bug.cgi?id=203655
<rdar://problem/56767543>

Reviewed by Antti Koivisto.

Do not set the isCollapsed flag on the line run unless we actually collapsed it (changed its length from greated than 1 to 1).

• layout/inlineformatting/InlineLine.cpp:

(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-10-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Set setIsCollapsed on the line item when its content is actually collapsed
+        https://bugs.webkit.org/show_bug.cgi?id=203655
+        <rdar://problem/56767543>
+
+        Reviewed by Antti Koivisto.
+
+        Do not set the isCollapsed flag on the line run unless we actually collapsed it (changed its length from greated than 1 to 1).
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::appendTextContent):
+
 2019-10-31  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -370 +370 @@
     }
 
-    auto collapseRun = inlineItem.isCollapsible();
+    auto collapsedRun = inlineItem.isCollapsible() && inlineItem.length() > 1;
     auto contentStart = inlineItem.start();
-    auto contentLength =  collapseRun ? 1 : inlineItem.length();
+    auto contentLength =  collapsedRun ? 1 : inlineItem.length();
     auto textContent = inlineItem.layoutBox().textContent().substring(contentStart, contentLength);
     auto lineRun = makeUnique<Run>(inlineItem, Display::Run { inlineItem.style(), logicalRect, Display::Run::TextContext { contentStart, contentLength, textContent } });
@@ -379 +379 @@
     if (collapsesToZeroAdvanceWidth)
         lineRun->setCollapsesToZeroAdvanceWidth();
-    else if (collapseRun)
+    else if (collapsedRun)
         lineRun->setIsCollapsed();
     if (isTrimmable)