[IFC][Integration] Enable non-inflow list items for IFC

https://bugs.webkit.org/show_bug.cgi?id=248370 Reviewed by Antti Koivisto. * Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp: (WebCore::LayoutIntegration::printReason): (WebCore::LayoutIntegration::canUseForChild): (WebCore::LayoutIntegration::canUseForLineLayoutWithReason): * Source/WebCore/layout/integration/LayoutIntegrationCoverage.h: Canonical link: https://commits.webkit.org/257050@main
WebKit · Nov 27, 2022 · ac7cf1d · ac7cf1d
1 parent 5da705d
commit ac7cf1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt b/LayoutTests/platform/ios/fast/lists/001-vertical-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 776x584
       RenderBlock {DIV} at (0,0) size 108x584 [border: (3px solid #FFA500)]
         RenderListItem {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
-          RenderListMarker at (11,-18) size 19x7: bullet
+          RenderListMarker at (12,-18) size 19x7: bullet
         RenderListItem {DIV} at (11,11) size 86x562 [border: (3px solid #FFA500)]
           RenderListItem {DIV} at (11,11) size 64x540 [border: (3px solid #FFA500)]
             RenderListItem {DIV} at (11,11) size 42x518 [border: (3px solid #FFA500)]

diff --git a/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp b/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp
@@ -142,8 +142,8 @@ static void printReason(AvoidanceReason reason, TextStream& stream)
     case AvoidanceReason::ContentIsSVG:
         stream << "SVG content";
         break;
-    case AvoidanceReason::FlowIsUnsupportedListItem:
-        stream << "list item with text-indent";
+    case AvoidanceReason::ChildIsUnsupportedListItem:
+        stream << "list item with floats";
         break;
     case AvoidanceReason::FlowHasInitialLetter:
         stream << "intial letter";
@@ -430,7 +430,7 @@ static OptionSet<AvoidanceReason> canUseForChild(const RenderObject& child, Incl
         auto* associatedListItem = listMarker.listItem();
         for (auto* ancestor = listMarker.containingBlock(); ancestor; ancestor = ancestor->containingBlock()) {
             if (ancestor->containsFloats())
-                SET_REASON_AND_RETURN_IF_NEEDED(FlowIsUnsupportedListItem, reasons, includeReasons);
+                SET_REASON_AND_RETURN_IF_NEEDED(ChildIsUnsupportedListItem, reasons, includeReasons);
             if (ancestor == associatedListItem)
                 break;
         }
@@ -493,8 +493,6 @@ OptionSet<AvoidanceReason> canUseForLineLayoutWithReason(const RenderBlockFlow&
     }
     if (flow.isRubyText() || flow.isRubyBase())
         SET_REASON_AND_RETURN_IF_NEEDED(ContentIsRuby, reasons, includeReasons);
-    if (is<RenderListItem>(flow) && (flow.isPositioned() || flow.isFloating()))
-        SET_REASON_AND_RETURN_IF_NEEDED(FlowIsUnsupportedListItem, reasons, includeReasons);
 #if ENABLE(VIDEO)
     if (is<RenderVTTCue>(flow) || is<RenderVTTCue>(flow.parent())) {
         // First child of the RenderVTTCue is the backdropBox.

diff --git a/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h b/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h
@@ -98,7 +98,7 @@ enum class AvoidanceReason : uint64_t {
     // Unused                                    = 1LLU  << 58,
     // Unused                                    = 1LLU  << 59,
     // Unused                                    = 1LLU  << 60,
-    FlowIsUnsupportedListItem                    = 1LLU  << 61,
+    ChildIsUnsupportedListItem                   = 1LLU  << 61,
     EndOfReasons                                 = 1LLU  << 62
 };