Changeset 252810 in webkit

Timestamp:

Nov 22, 2019 3:30:43 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Merge "insert inline runs" and "setup display runs" loops in InlineFormattingContext::setDisplayBoxesForLine
​https://bugs.webkit.org/show_bug.cgi?id=204537
<rdar://problem/57440394>

Reviewed by Antti Koivisto.

Let's loop the new Line::Run list only once.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::setDisplayBoxesForLine):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Merge "insert inline runs" and "setup display runs" loops in InlineFormattingContext::setDisplayBoxesForLine
+        https://bugs.webkit.org/show_bug.cgi?id=204537
+        <rdar://problem/57440394>
+
+        Reviewed by Antti Koivisto.
+
+        Let's loop the new Line::Run list only once.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::setDisplayBoxesForLine):
+
 2019-11-22  Chris Dumez  <cdumez@apple.com>
 

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

@@ -428 +428 @@
     }
 
-    // Add final display runs to state.
     formattingState.addLineBox(lineContent.lineBox);
-    // FIXME: This is tempoary.
     auto& currentLine = *formattingState.lineBoxes().last();
-    for (auto& lineRun : lineContent.runList) {
-        // Inline level containers (<span>) don't generate display runs.
-        if (lineRun.isContainerStart() || lineRun.isContainerEnd())
-            continue;
-        // Completely collapsed line runs don't generate display runs either.
-        if (lineRun.isCollapsedToVisuallyEmpty())
-            continue;
-        formattingState.addInlineRun(makeUnique<Display::Run>(lineRun.layoutBox().style(), lineRun.logicalRect(), lineRun.textContext()), currentLine);
-    }
-
     // Compute box final geometry.
     auto& lineRuns = lineContent.runList;
@@ -449 +437 @@
         auto& layoutBox = lineRun.layoutBox();
         auto& displayBox = formattingState.displayBox(layoutBox);
+
+        // Add final display runs to state first.
+        // Inline level containers (<span>) don't generate display runs and neither do completely collapsed runs.
+        auto initiatesInlineRun = !lineRun.isContainerStart() && !lineRun.isContainerEnd() && !lineRun.isCollapsedToVisuallyEmpty();
+        if (initiatesInlineRun)
+            formattingState.addInlineRun(makeUnique<Display::Run>(lineRun.layoutBox().style(), lineRun.logicalRect(), lineRun.textContext()), currentLine);
 
         if (lineRun.isForcedLineBreak()) {