Title: [240580] trunk/Source/WebCore
- Revision
- 240580
- Author
- za...@apple.com
- Date
- 2019-01-28 07:29:28 -0800 (Mon, 28 Jan 2019)
Log Message
[LFC][BFC][Quirk] Ignore collapsed(through) margin after when stretching body height.
https://bugs.webkit.org/show_bug.cgi?id=193894
Reviewed by Antti Koivisto.
* layout/blockformatting/BlockFormattingContextQuirks.cpp:
(WebCore::Layout::BlockFormattingContext::Quirks::stretchedInFlowHeight):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240579 => 240580)
--- trunk/Source/WebCore/ChangeLog 2019-01-28 15:08:54 UTC (rev 240579)
+++ trunk/Source/WebCore/ChangeLog 2019-01-28 15:29:28 UTC (rev 240580)
@@ -1,3 +1,13 @@
+2019-01-28 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC][Quirk] Ignore collapsed(through) margin after when stretching body height.
+ https://bugs.webkit.org/show_bug.cgi?id=193894
+
+ Reviewed by Antti Koivisto.
+
+ * layout/blockformatting/BlockFormattingContextQuirks.cpp:
+ (WebCore::Layout::BlockFormattingContext::Quirks::stretchedInFlowHeight):
+
2019-01-28 Antoine Quint <grao...@apple.com>
Limit user-agent interactions based on the touch-action property on iOS
Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp (240579 => 240580)
--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp 2019-01-28 15:08:54 UTC (rev 240579)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp 2019-01-28 15:29:28 UTC (rev 240580)
@@ -93,7 +93,8 @@
auto nonCollapsedMargin = heightAndMargin.nonCollapsedMargin;
auto collapsedMargin = MarginCollapse::collapsedVerticalValues(layoutState, layoutBox, nonCollapsedMargin);
- totalVerticalMargin = collapsedMargin.before.valueOr(nonCollapsedMargin.before) + collapsedMargin.after.valueOr(nonCollapsedMargin.after);
+ totalVerticalMargin = collapsedMargin.before.valueOr(nonCollapsedMargin.before);
+ totalVerticalMargin += collapsedMargin.isCollapsedThrough ? nonCollapsedMargin.after : collapsedMargin.after.valueOr(nonCollapsedMargin.after);
}
// Stretch but never overstretch with the margins.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
