Title: [269779] trunk/Source/WebCore
- Revision
- 269779
- Author
- [email protected]
- Date
- 2020-11-13 08:08:14 -0800 (Fri, 13 Nov 2020)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (269778 => 269779)
--- trunk/Source/WebCore/ChangeLog 2020-11-13 16:04:15 UTC (rev 269778)
+++ trunk/Source/WebCore/ChangeLog 2020-11-13 16:08:14 UTC (rev 269779)
@@ -1,3 +1,15 @@
+2020-11-13 Antti Koivisto <[email protected]>
+
+ [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 <[email protected]>
Crash in ReplaceSelectionCommand::moveNodeOutOfAncestor
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (269778 => 269779)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2020-11-13 16:04:15 UTC (rev 269778)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2020-11-13 16:08:14 UTC (rev 269779)
@@ -604,8 +604,8 @@
#endif
#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)
if (block.isFloating() || block.isPositioned())
@@ -614,6 +614,8 @@
SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonSupportedChild, reasons, includeReasons);
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);
if (style.width().isPercent() || style.height().isPercent())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
