Title: [240781] trunk
- Revision
- 240781
- Author
- za...@apple.com
- Date
- 2019-01-31 05:59:43 -0800 (Thu, 31 Jan 2019)
Log Message
[LFC] Margin before/after/start/end initial value is 0 and not auto.
https://bugs.webkit.org/show_bug.cgi?id=194090
Reviewed by Antti Koivisto.
Source/WebCore:
Don't treat it like auto.
* layout/FormattingContextGeometry.cpp:
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
Tools:
* LayoutReloaded/misc/LFC-passing-tests.txt:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240780 => 240781)
--- trunk/Source/WebCore/ChangeLog 2019-01-31 13:39:44 UTC (rev 240780)
+++ trunk/Source/WebCore/ChangeLog 2019-01-31 13:59:43 UTC (rev 240781)
@@ -1,5 +1,18 @@
2019-01-31 Zalan Bujtas <za...@apple.com>
+ [LFC] Margin before/after/start/end initial value is 0 and not auto.
+ https://bugs.webkit.org/show_bug.cgi?id=194090
+
+ Reviewed by Antti Koivisto.
+
+ Don't treat it like auto.
+
+ * layout/FormattingContextGeometry.cpp:
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry):
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
+
+2019-01-31 Zalan Bujtas <za...@apple.com>
+
[LFC] Use the used margin values in outOfFlowReplacedHorizontalGeometry consistently
https://bugs.webkit.org/show_bug.cgi?id=194074
Modified: trunk/Source/WebCore/layout/FormattingContextGeometry.cpp (240780 => 240781)
--- trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2019-01-31 13:39:44 UTC (rev 240780)
+++ trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2019-01-31 13:59:43 UTC (rev 240781)
@@ -554,8 +554,8 @@
auto isStaticallyPositioned = !top && !bottom;
auto height = inlineReplacedHeightAndMargin(layoutState, layoutBox, usedHeight).height;
auto computedVerticalMargin = Geometry::computedVerticalMargin(layoutState, layoutBox);
- Optional<LayoutUnit> usedMarginBefore;
- Optional<LayoutUnit> usedMarginAfter;
+ Optional<LayoutUnit> usedMarginBefore = computedVerticalMargin.before;
+ Optional<LayoutUnit> usedMarginAfter = computedVerticalMargin.after;
auto paddingTop = displayBox.paddingTop().valueOr(0);
auto paddingBottom = displayBox.paddingBottom().valueOr(0);
auto borderTop = displayBox.borderTop();
@@ -642,8 +642,8 @@
auto right = computedValueIfNotAuto(style.logicalRight(), containingBlockWidth);
auto isStaticallyPositioned = !left && !right;
auto computedHorizontalMargin = Geometry::computedHorizontalMargin(layoutState, layoutBox);
- Optional<LayoutUnit> usedMarginStart;
- Optional<LayoutUnit> usedMarginEnd;
+ Optional<LayoutUnit> usedMarginStart = computedHorizontalMargin.start;
+ Optional<LayoutUnit> usedMarginEnd = computedHorizontalMargin.end;
auto width = inlineReplacedWidthAndMargin(layoutState, layoutBox, usedWidth).width;
auto paddingLeft = displayBox.paddingLeft().valueOr(0);
auto paddingRight = displayBox.paddingRight().valueOr(0);
Modified: trunk/Tools/ChangeLog (240780 => 240781)
--- trunk/Tools/ChangeLog 2019-01-31 13:39:44 UTC (rev 240780)
+++ trunk/Tools/ChangeLog 2019-01-31 13:59:43 UTC (rev 240781)
@@ -1,5 +1,14 @@
2019-01-31 Zalan Bujtas <za...@apple.com>
+ [LFC] Margin before/after/start/end initial value is 0 and not auto.
+ https://bugs.webkit.org/show_bug.cgi?id=194090
+
+ Reviewed by Antti Koivisto.
+
+ * LayoutReloaded/misc/LFC-passing-tests.txt:
+
+2019-01-31 Zalan Bujtas <za...@apple.com>
+
[LFC] Use the used margin values in outOfFlowReplacedHorizontalGeometry consistently
https://bugs.webkit.org/show_bug.cgi?id=194074
Modified: trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt (240780 => 240781)
--- trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt 2019-01-31 13:39:44 UTC (rev 240780)
+++ trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt 2019-01-31 13:59:43 UTC (rev 240781)
@@ -421,6 +421,14 @@
css2.1/20110323/absolute-replaced-height-011.htm
css2.1/20110323/absolute-replaced-height-012.htm
css2.1/20110323/absolute-replaced-height-014.htm
+css2.1/20110323/absolute-replaced-height-018.htm
+css2.1/20110323/absolute-replaced-height-019.htm
+css2.1/20110323/absolute-replaced-height-021.htm
+css2.1/20110323/absolute-replaced-height-025.htm
+css2.1/20110323/absolute-replaced-height-026.htm
+css2.1/20110323/block-replaced-height-004.htm
+css2.1/20110323/block-replaced-height-005.htm
+css2.1/20110323/block-replaced-height-007.htm
css2.1/t0402-c71-fwd-parsing-00-f.html
css2.1/t0402-c71-fwd-parsing-01-f.html
css2.1/t0402-c71-fwd-parsing-03-f.html
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
