Changeset 247151 in webkit

Timestamp:

Jul 5, 2019 7:02:22 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Empty text node should generate empty InlineTextItem
​https://bugs.webkit.org/show_bug.cgi?id=199495
<rdar://problem/52643225>

Reviewed by Antti Koivisto.

Empty text nodes generate empty RenderText renderers but they don't generate inline boxes.
This patch aligns LFC with the current rendering code.

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::appendTextContent):

• layout/inlineformatting/InlineTextItem.cpp:

(WebCore::Layout::InlineTextItem::createAndAppendTextItems):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-05  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Empty text node should generate empty InlineTextItem
+        https://bugs.webkit.org/show_bug.cgi?id=199495
+        <rdar://problem/52643225>
+
+        Reviewed by Antti Koivisto.
+
+        Empty text nodes generate empty RenderText renderers but they don't generate inline boxes.
+        This patch aligns LFC with the current rendering code.
+
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::appendTextContent):
+        * layout/inlineformatting/InlineTextItem.cpp:
+        (WebCore::Layout::InlineTextItem::createAndAppendTextItems):
+
 2019-07-05  Adrian Perez de Castro  <aperez@igalia.com>
 

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

@@ -237 +237 @@
 
     auto shouldCollapseCompletely = [&] {
+        // Empty run.
+        if (!inlineItem.length()) {
+            ASSERT(!logicalWidth);
+            return true;
+        }
         if (!isTrimmable)
             return false;

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

@@ -89 +89 @@
 void InlineTextItem::createAndAppendTextItems(InlineItems& inlineContent, const InlineBox& inlineBox)
 {
+    auto text = inlineBox.textContent();
+    if (!text.length())
+        return inlineContent.append(std::make_unique<InlineTextItem>(inlineBox, 0, 0, false, false));
+
     auto& style = inlineBox.style();
     auto preserveNewline = style.preserveNewline();
     auto collapseWhiteSpace = style.collapseWhiteSpace();
-    auto text = inlineBox.textContent();
     LazyLineBreakIterator lineBreakIterator(text);
-
     unsigned currentPosition = 0;
     while (currentPosition < text.length()) {