Changeset 252543 in webkit

Timestamp:

Nov 18, 2019 9:13:51 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][Invalidation] Do not collect inline items multiple times
​https://bugs.webkit.org/show_bug.cgi?id=204296
<rdar://problem/57283761>

Reviewed by Antti Koivisto.

When inline layout is preceded by preferred width computation, we don't need to re-collect the inline items again.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraints):
(WebCore::Layout::InlineFormattingContext::collectInlineContentIfNeeded):
(WebCore::Layout::InlineFormattingContext::collectInlineContent): Deleted.

• layout/inlineformatting/InlineFormattingContext.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-18  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Invalidation] Do not collect inline items multiple times
+        https://bugs.webkit.org/show_bug.cgi?id=204296
+        <rdar://problem/57283761>
+
+        Reviewed by Antti Koivisto.
+
+        When inline layout is preceded by preferred width computation, we don't need to re-collect the inline items again. 
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraints):
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentIfNeeded):
+        (WebCore::Layout::InlineFormattingContext::collectInlineContent): Deleted.
+        * layout/inlineformatting/InlineFormattingContext.h:
+
 2019-11-18  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -85 +85 @@
     }
 
-    collectInlineContent();
+    collectInlineContentIfNeeded();
     lineLayout(usedHorizontalValues);
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[End] -> inline formatting context -> formatting root(" << &root() << ")");
@@ -211 +211 @@
     }
 
-    collectInlineContent();
+    collectInlineContentIfNeeded();
 
     auto maximumLineWidth = [&](auto availableWidth) {
@@ -322 +322 @@
 }
 
-void InlineFormattingContext::collectInlineContent()
-{
+void InlineFormattingContext::collectInlineContentIfNeeded()
+{
+    auto& formattingState = this->formattingState();
+    if (!formattingState.inlineItems().isEmpty())
+        return;
     // Traverse the tree and create inline items out of containers and leaf nodes. This essentially turns the tree inline structure into a flat one.
     // <span>text<span></span><img></span> -> [ContainerStart][InlineBox][ContainerStart][ContainerEnd][InlineBox][ContainerEnd]
-    auto& formattingState = this->formattingState();
     LayoutQueue layoutQueue;
     if (root().hasInFlowOrFloatingChild())

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

@@ -89 +89 @@
     void computeWidthAndMargin(const Box&, UsedHorizontalValues);
 
-    void collectInlineContent();
+    void collectInlineContentIfNeeded();
     Line::InitialConstraints initialConstraintsForLine(UsedHorizontalValues, const LayoutUnit lineLogicalTop);
     void setDisplayBoxesForLine(const LineLayout::LineContent&, UsedHorizontalValues);