Title: [246463] trunk/Source/WebCore
- Revision
- 246463
- Author
- [email protected]
- Date
- 2019-06-15 07:16:13 -0700 (Sat, 15 Jun 2019)
Log Message
[LFC][MarginCollapsing] Collapsed through margin values preserve quirk state.
https://bugs.webkit.org/show_bug.cgi?id=198885
<rdar://problem/51773568>
Reviewed by Antti Koivisto.
The collapsed through margin becomes a quirk margin if either of the vertical(before/after) margins have quirk value.
* layout/blockformatting/BlockMarginCollapse.cpp:
(WebCore::Layout::computedPositiveAndNegativeMargin):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (246462 => 246463)
--- trunk/Source/WebCore/ChangeLog 2019-06-15 14:13:55 UTC (rev 246462)
+++ trunk/Source/WebCore/ChangeLog 2019-06-15 14:16:13 UTC (rev 246463)
@@ -1,5 +1,18 @@
2019-06-15 Zalan Bujtas <[email protected]>
+ [LFC][MarginCollapsing] Collapsed through margin values preserve quirk state.
+ https://bugs.webkit.org/show_bug.cgi?id=198885
+ <rdar://problem/51773568>
+
+ Reviewed by Antti Koivisto.
+
+ The collapsed through margin becomes a quirk margin if either of the vertical(before/after) margins have quirk value.
+
+ * layout/blockformatting/BlockMarginCollapse.cpp:
+ (WebCore::Layout::computedPositiveAndNegativeMargin):
+
+2019-06-15 Zalan Bujtas <[email protected]>
+
[LFC[MarginCollapsing] Anonymous boxes never collapse their margins with siblings.
https://bugs.webkit.org/show_bug.cgi?id=198884
<rdar://problem/51773509>
Modified: trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (246462 => 246463)
--- trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2019-06-15 14:13:55 UTC (rev 246462)
+++ trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2019-06-15 14:16:13 UTC (rev 246463)
@@ -451,7 +451,7 @@
computedValues.negative = a.negative ? a.negative : b.negative;
if (a.isNonZero() && b.isNonZero())
- computedValues.isQuirk = a.isQuirk && b.isQuirk;
+ computedValues.isQuirk = a.isQuirk || b.isQuirk;
else if (a.isNonZero())
computedValues.isQuirk = a.isQuirk;
else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
