[LFC][Integration] Disable non-text content with floats

alanbaradlay · alanbaradlay · commit 7bbfbb7ad006 · 2020-11-19T14:19:36.000Z
https://bugs.webkit.org/show_bug.cgi?id=219122 Reviewed by Antti Koivisto. Non-text content may stretch the line and we don't yet have support for dynamic float avoiding (as the line grows). * layout/integration/LayoutIntegrationCoverage.cpp: (WebCore::LayoutIntegration::canUseForLineLayoutWithReason): Canonical link: https://commits.webkit.org/231768@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2020-11-19  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Disable non-text content with floats
+        https://bugs.webkit.org/show_bug.cgi?id=219122
+
+        Reviewed by Antti Koivisto.
+
+        Non-text content may stretch the line and we don't yet have support for dynamic float avoiding (as the line grows).
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForLineLayoutWithReason):
+
 2020-11-19  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][Integration] Allow subpixel difference in the computed containing block height when switching between line layout systems
diff --git a/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp b/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp
@@ -712,6 +712,10 @@ OptionSet<AvoidanceReason> canUseForLineLayoutWithReason(const RenderBlockFlow&
     // This currently covers <blockflow>#text</blockflow>, <blockflow>#text<br></blockflow> and mutiple (sibling) RenderText cases.
     // The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
     for (const auto* child = flow.firstChild(); child; child = child->nextSibling()) {
+        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)
             ADD_REASONS_AND_RETURN_IF_NEEDED(childReasons, reasons, includeReasons);
