[LFC] Do not collapse margin with the parent when element has border/padding.
[WebKit-https.git] / Source / WebCore / ChangeLog
index 387f9e4..ad5b4ae 100644 (file)
@@ -1,3 +1,17 @@
+2018-06-27  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Do not collapse margin with the parent when element has border/padding.
+        https://bugs.webkit.org/show_bug.cgi?id=187114
+
+        Reviewed by Antti Koivisto.
+
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layout const):
+        * layout/blockformatting/BlockMarginCollapse.cpp:
+        (WebCore::Layout::isMarginTopCollapsedWithParent):
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::collapsedMarginTopFromFirstChild):
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginTop):
+
 2018-06-27  Simon Fraser  <simon.fraser@apple.com>
 
         Fix Windows build after r233268.