Diff
Modified: trunk/LayoutTests/ChangeLog (290867 => 290868)
--- trunk/LayoutTests/ChangeLog 2022-03-05 16:57:58 UTC (rev 290867)
+++ trunk/LayoutTests/ChangeLog 2022-03-05 17:18:30 UTC (rev 290868)
@@ -1,3 +1,13 @@
+2022-03-05 Alan Bujtas <za...@apple.com>
+
+ [IFC][Integration] Do not bail out on IFC content with floats inside.
+ https://bugs.webkit.org/show_bug.cgi?id=237494
+
+ Reviewed by Antti Koivisto.
+
+ * platform/ios/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
+ * platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
+
2022-03-05 Antti Koivisto <an...@apple.com>
Resolve ::first-line style eagerly
Modified: trunk/LayoutTests/platform/ios/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt (290867 => 290868)
--- trunk/LayoutTests/platform/ios/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt 2022-03-05 16:57:58 UTC (rev 290867)
+++ trunk/LayoutTests/platform/ios/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt 2022-03-05 17:18:30 UTC (rev 290868)
@@ -30,8 +30,8 @@
text run at (0,123) width 41: "FAIL "
text run at (40,123) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (514,123) width 74: "FAIL FAIL"
- text run at (0,143) width 396: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
- text run at (395,143) width 193: "FAIL FAIL FAIL FAIL FAIL"
+ text run at (0,143) width 397: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+ text run at (396,143) width 192: "FAIL FAIL FAIL FAIL FAIL"
text run at (0,163) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (277,163) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
text run at (0,183) width 159: "FAIL FAIL FAIL FAIL "
@@ -39,8 +39,8 @@
text run at (0,203) width 41: "FAIL "
text run at (40,203) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (514,203) width 74: "FAIL FAIL"
- text run at (0,223) width 396: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
- text run at (395,223) width 193: "FAIL FAIL FAIL FAIL FAIL"
+ text run at (0,223) width 397: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+ text run at (396,223) width 192: "FAIL FAIL FAIL FAIL FAIL"
text run at (0,243) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (277,243) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
text run at (0,263) width 148: "FAIL FAIL FAIL FAIL"
Modified: trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt (290867 => 290868)
--- trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt 2022-03-05 16:57:58 UTC (rev 290867)
+++ trunk/LayoutTests/platform/mac/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt 2022-03-05 17:18:30 UTC (rev 290868)
@@ -30,8 +30,8 @@
text run at (0,114) width 41: "FAIL "
text run at (40,114) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (514,114) width 74: "FAIL FAIL"
- text run at (0,132) width 396: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
- text run at (395,132) width 193: "FAIL FAIL FAIL FAIL FAIL"
+ text run at (0,132) width 397: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+ text run at (396,132) width 192: "FAIL FAIL FAIL FAIL FAIL"
text run at (0,150) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (277,150) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
text run at (0,168) width 159: "FAIL FAIL FAIL FAIL "
@@ -39,8 +39,8 @@
text run at (0,186) width 41: "FAIL "
text run at (40,186) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (514,186) width 74: "FAIL FAIL"
- text run at (0,204) width 396: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
- text run at (395,204) width 193: "FAIL FAIL FAIL FAIL FAIL"
+ text run at (0,204) width 397: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
+ text run at (396,204) width 192: "FAIL FAIL FAIL FAIL FAIL"
text run at (0,222) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL "
text run at (277,222) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
text run at (0,240) width 148: "FAIL FAIL FAIL FAIL"
Modified: trunk/Source/WebCore/ChangeLog (290867 => 290868)
--- trunk/Source/WebCore/ChangeLog 2022-03-05 16:57:58 UTC (rev 290867)
+++ trunk/Source/WebCore/ChangeLog 2022-03-05 17:18:30 UTC (rev 290868)
@@ -1,3 +1,16 @@
+2022-03-05 Alan Bujtas <za...@apple.com>
+
+ [IFC][Integration] Do not bail out on IFC content with floats inside.
+ https://bugs.webkit.org/show_bug.cgi?id=237494
+
+ Reviewed by Antti Koivisto.
+
+ We have support for such content now.
+ (This gives a noticeable coverage boost on PLT5 content.)
+
+ * layout/integration/LayoutIntegrationCoverage.cpp:
+ (WebCore::LayoutIntegration::canUseForChild):
+
2022-03-05 Antti Koivisto <an...@apple.com>
Resolve ::first-line style eagerly
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (290867 => 290868)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2022-03-05 16:57:58 UTC (rev 290867)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2022-03-05 17:18:30 UTC (rev 290868)
@@ -461,7 +461,7 @@
return reasons;
}
-static OptionSet<AvoidanceReason> canUseForChild(const RenderBlockFlow& flow, const RenderObject& child, IncludeReasons includeReasons)
+static OptionSet<AvoidanceReason> canUseForChild(const RenderObject& child, IncludeReasons includeReasons)
{
OptionSet<AvoidanceReason> reasons;
@@ -472,11 +472,6 @@
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);
- }
-
if (is<RenderLineBreak>(child))
return reasons;
@@ -590,7 +585,7 @@
// The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
auto hasSeenInlineBox = false;
for (auto walker = InlineWalker(flow); !walker.atEnd(); walker.advance()) {
- if (auto childReasons = canUseForChild(flow, *walker.current(), includeReasons))
+ if (auto childReasons = canUseForChild(*walker.current(), includeReasons))
ADD_REASONS_AND_RETURN_IF_NEEDED(childReasons, reasons, includeReasons);
hasSeenInlineBox = hasSeenInlineBox || is<RenderInline>(*walker.current());
}
