Title: [257549] trunk/Source/WebCore
- Revision
- 257549
- Author
- [email protected]
- Date
- 2020-02-26 18:56:46 -0800 (Wed, 26 Feb 2020)
Log Message
REGRESSION (r257507): [ macOS ] ASSERTION FAILED: blockFormattingState.hasPositiveAndNegativeVerticalMargin(layoutBox)
https://bugs.webkit.org/show_bug.cgi?id=208278
<rdar://problem/59828533>
Fix mismatching call after r257507.
* layout/blockformatting/PrecomputedBlockMarginCollapse.cpp:
(WebCore::Layout::BlockFormattingContext::MarginCollapse::precomputedPositiveNegativeValues const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (257548 => 257549)
--- trunk/Source/WebCore/ChangeLog 2020-02-27 02:31:35 UTC (rev 257548)
+++ trunk/Source/WebCore/ChangeLog 2020-02-27 02:56:46 UTC (rev 257549)
@@ -1,3 +1,14 @@
+2020-02-26 Zalan Bujtas <[email protected]>
+
+ REGRESSION (r257507): [ macOS ] ASSERTION FAILED: blockFormattingState.hasPositiveAndNegativeVerticalMargin(layoutBox)
+ https://bugs.webkit.org/show_bug.cgi?id=208278
+ <rdar://problem/59828533>
+
+ Fix mismatching call after r257507.
+
+ * layout/blockformatting/PrecomputedBlockMarginCollapse.cpp:
+ (WebCore::Layout::BlockFormattingContext::MarginCollapse::precomputedPositiveNegativeValues const):
+
2020-02-26 Andres Gonzalez <[email protected]>
AXIsolatedObject support for table cells.
Modified: trunk/Source/WebCore/layout/blockformatting/PrecomputedBlockMarginCollapse.cpp (257548 => 257549)
--- trunk/Source/WebCore/layout/blockformatting/PrecomputedBlockMarginCollapse.cpp 2020-02-27 02:31:35 UTC (rev 257548)
+++ trunk/Source/WebCore/layout/blockformatting/PrecomputedBlockMarginCollapse.cpp 2020-02-27 02:56:46 UTC (rev 257549)
@@ -42,7 +42,7 @@
auto nonCollapsedMargin = UsedVerticalMargin::NonCollapsedValues { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
if (marginType == MarginType::Before)
- return positiveNegativeMarginBefore(layoutBox, nonCollapsedMargin);
+ return precomputedPositiveNegativeMarginBefore(layoutBox, nonCollapsedMargin);
return positiveNegativeMarginAfter(layoutBox, nonCollapsedMargin);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
