Title: [236036] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 236036
- Author
- [email protected]
- Date
- 2018-09-17 01:14:50 -0700 (Mon, 17 Sep 2018)
Log Message
Merge r235170 - Add changes missing from r234925.
* layout/blockformatting/BlockMarginCollapse.cpp:
(WebCore::Layout::isMarginTopCollapsedWithParent):
(WebCore::Layout::isMarginBottomCollapsedThrough):
(WebCore::Layout::BlockFormattingContext::MarginCollapse::isMarginBottomCollapsedWithParent):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236035 => 236036)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-17 07:11:55 UTC (rev 236035)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-09-17 08:14:50 UTC (rev 236036)
@@ -1,3 +1,12 @@
+2018-08-22 Zalan Bujtas <[email protected]>
+
+ Add changes missing from r234925.
+
+ * layout/blockformatting/BlockMarginCollapse.cpp:
+ (WebCore::Layout::isMarginTopCollapsedWithParent):
+ (WebCore::Layout::isMarginBottomCollapsedThrough):
+ (WebCore::Layout::BlockFormattingContext::MarginCollapse::isMarginBottomCollapsedWithParent):
+
2018-08-22 Carlos Garcia Campos <[email protected]>
Do not try to update the compositing policy when not in accelerated compositing mode
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (236035 => 236036)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2018-09-17 07:11:55 UTC (rev 236035)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2018-09-17 08:14:50 UTC (rev 236036)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
