Changeset 275509 in webkit

Timestamp:

Apr 6, 2021 6:18:50 AM (3 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Disable LFC if paginated context has inline boxes
​https://bugs.webkit.org/show_bug.cgi?id=224222

Reviewed by Zalan Bujtas.

There are no known problems with this combination but it is untested.

• layout/integration/LayoutIntegrationCoverage.cpp:

(WebCore::LayoutIntegration::canUseForChild):

Pass in the RenderBlockFlow and move the existing test requiring it here too.

(WebCore::LayoutIntegration::canUseForLineLayoutWithReason):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationCoverage.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-06  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Disable LFC if paginated context has inline boxes
+        https://bugs.webkit.org/show_bug.cgi?id=224222
+
+        Reviewed by Zalan Bujtas.
+
+        There are no known problems with this combination but it is untested.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForChild):
+        
+        Pass in the RenderBlockFlow and move the existing test requiring it here too.
+        
+        (WebCore::LayoutIntegration::canUseForLineLayoutWithReason):
+        
 2021-04-06  Keith Miller  <keith_miller@apple.com>
 

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

@@ -599 +599 @@
 }
 
-static OptionSet<AvoidanceReason> canUseForChild(const RenderObject& child, IncludeReasons includeReasons)
+static OptionSet<AvoidanceReason> canUseForChild(const RenderBlockFlow& flow, const RenderObject& child, IncludeReasons includeReasons)
 {
     OptionSet<AvoidanceReason> reasons;
@@ -611 +611 @@
             SET_REASON_AND_RETURN_IF_NEEDED(FlowIncludesDocumentMarkers, reasons, includeReasons);
         return reasons;
+    }
+    
+    if (flow.containsFloats()) {
+        // Non-text content may stretch the line and we don't yet have support for dynamic float avoiding (as the line grows).
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedFloat, reasons, includeReasons);
     }
 
@@ -688 +693 @@
         if (renderInline.requiresLayer())
             SET_REASON_AND_RETURN_IF_NEEDED(InlineBoxNeedsLayer, reasons, includeReasons)
+        if (flow.fragmentedFlowState() != RenderObject::NotInsideFragmentedFlow)
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
 
         auto& style = renderInline.style();
@@ -797 +804 @@
     // The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
     for (auto walker = InlineWalker(const_cast<RenderBlockFlow&>(flow)); !walker.atEnd(); walker.advance()) {
-        auto& child = *walker.current();
-        if (!is<RenderText>(child) && flow.containsFloats()) {
-            // Non-text content may stretch the line and we don't yet have support for dynamic float avoiding (as the line grows).
-            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedFloat, reasons, includeReasons);
-        }
-        auto childReasons = canUseForChild(child, includeReasons);
-        if (childReasons)
+        if (auto childReasons = canUseForChild(flow, *walker.current(), includeReasons))
             ADD_REASONS_AND_RETURN_IF_NEEDED(childReasons, reasons, includeReasons);
     }