Title: [240545] trunk/Source/WebCore
- Revision
- 240545
- Author
- [email protected]
- Date
- 2019-01-26 05:13:00 -0800 (Sat, 26 Jan 2019)
Log Message
[LFC][BFC][MarginCollapsing] marginAfterCollapsesWithParentMarginAfter/marginAfterCollapsesWithLastInFlowChildMarginAfter should check for border/padding after values.
https://bugs.webkit.org/show_bug.cgi?id=193864
Reviewed by Antti Koivisto.
* layout/blockformatting/BlockMarginCollapse.cpp:
(WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMarginAfter):
(WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240544 => 240545)
--- trunk/Source/WebCore/ChangeLog 2019-01-26 12:44:17 UTC (rev 240544)
+++ trunk/Source/WebCore/ChangeLog 2019-01-26 13:13:00 UTC (rev 240545)
@@ -1,5 +1,16 @@
2019-01-26 Zalan Bujtas <[email protected]>
+ [LFC][BFC][MarginCollapsing] marginAfterCollapsesWithParentMarginAfter/marginAfterCollapsesWithLastInFlowChildMarginAfter should check for border/padding after values.
+ https://bugs.webkit.org/show_bug.cgi?id=193864
+
+ Reviewed by Antti Koivisto.
+
+ * layout/blockformatting/BlockMarginCollapse.cpp:
+ (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMarginAfter):
+ (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter):
+
+2019-01-26 Zalan Bujtas <[email protected]>
+
[LFC] Box::nextInFlowOrFloatingSibling() should always return sibling floats as well.
https://bugs.webkit.org/show_bug.cgi?id=193855
Modified: trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (240544 => 240545)
--- trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2019-01-26 12:44:17 UTC (rev 240544)
+++ trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2019-01-26 13:13:00 UTC (rev 240545)
@@ -295,11 +295,11 @@
return false;
// the box has no bottom padding, and
- if (hasPaddingBefore(parent))
+ if (hasPaddingAfter(parent))
return false;
// the box has no bottom border, and
- if (hasBorderBefore(parent))
+ if (hasBorderAfter(parent))
return false;
// the child's bottom margin neither collapses with a top margin that has clearance...
@@ -337,11 +337,11 @@
return false;
// the box has no bottom padding, and
- if (hasPaddingBefore(layoutBox))
+ if (hasPaddingAfter(layoutBox))
return false;
// the box has no bottom border, and
- if (hasBorderBefore(layoutBox))
+ if (hasBorderAfter(layoutBox))
return false;
// the child's bottom margin neither collapses with a top margin that has clearance...
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
