Changeset 269779 in webkit

Timestamp:

Nov 13, 2020, 8:08:14 AM (6 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Tighten inline-block coverage conditions
​https://bugs.webkit.org/show_bug.cgi?id=218901

Reviewed by Zalan Bujtas.

The current ones allow some non-inline-blocks.

• layout/integration/LayoutIntegrationCoverage.cpp:

(WebCore::LayoutIntegration::canUseForChild):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-13  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Tighten inline-block coverage conditions
+        https://bugs.webkit.org/show_bug.cgi?id=218901
+
+        Reviewed by Zalan Bujtas.
+
+        The current ones allow some non-inline-blocks.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForChild):
+
 2020-11-13  Julian Gonzalez  <julian_a_gonzalez@apple.com>
 

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

@@ -605 +605 @@
 
 #if ALLOW_INLINE_BLOCK
-    if (is<RenderBlock>(child)) {
-        auto& block = downcast<RenderBlock>(child);
+    if (is<RenderBlockFlow>(child)) {
+        auto& block = downcast<RenderBlockFlow>(child);
         if (!block.isReplaced() || !block.isInline())
             SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons)
@@ -615 +615 @@
 
         auto& style = block.style();
+        if (block.style().display() != DisplayType::InlineBlock)
+            SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons)
         if (style.verticalAlign() == VerticalAlign::Sub || style.verticalAlign() == VerticalAlign::Super)
             SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);