Title: [235170] trunk/Source/WebCore
- Revision
- 235170
- Author
- za...@apple.com
- Date
- 2018-08-22 07:27:43 -0700 (Wed, 22 Aug 2018)
Log Message
Add changes missing from r234925.
* layout/blockformatting/BlockMarginCollapse.cpp:
(WebCore::Layout::isMarginTopCollapsedWithParent):
(WebCore::Layout::isMarginBottomCollapsedThrough):
(WebCore::Layout::BlockFormattingContext::MarginCollapse::isMarginBottomCollapsedWithParent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235169 => 235170)
--- trunk/Source/WebCore/ChangeLog 2018-08-22 14:19:48 UTC (rev 235169)
+++ trunk/Source/WebCore/ChangeLog 2018-08-22 14:27:43 UTC (rev 235170)
@@ -1,3 +1,12 @@
+2018-08-22 Zalan Bujtas <za...@apple.com>
+
+ Add changes missing from r234925.
+
+ * layout/blockformatting/BlockMarginCollapse.cpp:
+ (WebCore::Layout::isMarginTopCollapsedWithParent):
+ (WebCore::Layout::isMarginBottomCollapsedThrough):
+ (WebCore::Layout::BlockFormattingContext::MarginCollapse::isMarginBottomCollapsedWithParent):
+
2018-08-22 Zan Dobersek <zdober...@igalia.com>
[CoordGraphics] Switch to Nicosia::CompositionLayer state tracking
Modified: trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (235169 => 235170)
--- trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2018-08-22 14:19:48 UTC (rev 235169)
+++ trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2018-08-22 14:27:43 UTC (rev 235170)
@@ -112,7 +112,7 @@
if (parentDisplayBox.borderTop())
return false;
- if (parentDisplayBox.paddingTop())
+ if (parentDisplayBox.paddingTop().value_or(0))
return false;
return true;
@@ -128,7 +128,7 @@
if (displayBox.borderTop() || displayBox.borderBottom())
return false;
- if (displayBox.paddingTop() || displayBox.paddingBottom())
+ if (displayBox.paddingTop().value_or(0) || displayBox.paddingBottom().value_or(0))
return false;
if (!layoutBox.style().height().isAuto() || !layoutBox.style().minHeight().isAuto())
@@ -289,7 +289,7 @@
if (parentDisplayBox.borderTop())
return false;
- if (parentDisplayBox.paddingTop())
+ if (parentDisplayBox.paddingTop().value_or(0))
return false;
if (!parent.style().height().isAuto())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
