Changeset 254568 in webkit

Timestamp:

Jan 15, 2020, 7:46:09 AM (7 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Call SimpleLineLayout::canUseFor only once
​https://bugs.webkit.org/show_bug.cgi?id=206281

Reviewed by Sam Weinig.

It can be somewhat costly.

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::canUseFor):

• layout/integration/LayoutIntegrationLineLayout.h:

(WebCore::LayoutIntegration::LineLayout::canUseFor):

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::layoutInlineChildren):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (2 diffs)
• layout/integration/LayoutIntegrationLineLayout.h (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-15  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Call SimpleLineLayout::canUseFor only once
+        https://bugs.webkit.org/show_bug.cgi?id=206281
+
+        Reviewed by Sam Weinig.
+
+        It can be somewhat costly.
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::canUseFor):
+        * layout/integration/LayoutIntegrationLineLayout.h:
+        (WebCore::LayoutIntegration::LineLayout::canUseFor):
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutInlineChildren):
+
 2020-01-15  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -59 +59 @@
 LineLayout::~LineLayout() = default;
 
-bool LineLayout::canUseFor(const RenderBlockFlow& flow)
+bool LineLayout::canUseFor(const RenderBlockFlow& flow, Optional<bool> couldUseSimpleLineLayout)
 {
     if (!RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextIntegrationEnabled())
@@ -65 +65 @@
 
     // Initially only a subset of SLL features is supported.
-    if (!SimpleLineLayout::canUseFor(flow))
+    auto passesSimpleLineLayoutTest = valueOrCompute(couldUseSimpleLineLayout, [&] {
+        return SimpleLineLayout::canUseFor(flow);
+    });
+
+    if (!passesSimpleLineLayoutTest)
         return false;
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h

@@ -59 +59 @@
     ~LineLayout();
 
-    static bool canUseFor(const RenderBlockFlow&);
+    static bool canUseFor(const RenderBlockFlow&, Optional<bool> couldUseSimpleLineLayout = { });
 
     void updateStyle();

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -670 +670 @@
 {
     auto computeLineLayoutPath = [&] {
+        bool canUseSimpleLines = SimpleLineLayout::canUseFor(*this);
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-        if (LayoutIntegration::LineLayout::canUseFor(*this))
+        if (LayoutIntegration::LineLayout::canUseFor(*this, canUseSimpleLines))
             return LayoutFormattingContextPath;
 #endif
-        if (SimpleLineLayout::canUseFor(*this))
+        if (canUseSimpleLines)
             return SimpleLinesPath;
+
         return LineBoxesPath;
     };