Title: [233397] trunk/Source/WebCore
- Revision
- 233397
- Author
- [email protected]
- Date
- 2018-06-30 11:04:58 -0700 (Sat, 30 Jun 2018)
Log Message
[LFC] Adjust final out-of-flow position with the computed margin value.
https://bugs.webkit.org/show_bug.cgi?id=187219
Reviewed by Antti Koivisto.
* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::computeOutOfFlowVerticalGeometry const):
(WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233396 => 233397)
--- trunk/Source/WebCore/ChangeLog 2018-06-30 17:11:36 UTC (rev 233396)
+++ trunk/Source/WebCore/ChangeLog 2018-06-30 18:04:58 UTC (rev 233397)
@@ -1,3 +1,14 @@
+2018-06-30 Zalan Bujtas <[email protected]>
+
+ [LFC] Adjust final out-of-flow position with the computed margin value.
+ https://bugs.webkit.org/show_bug.cgi?id=187219
+
+ Reviewed by Antti Koivisto.
+
+ * layout/FormattingContext.cpp:
+ (WebCore::Layout::FormattingContext::computeOutOfFlowVerticalGeometry const):
+ (WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry const):
+
2018-06-29 Antoine Quint <[email protected]>
[Web Animations] Make WPT test at timing-model/timelines/document-timelines.html pass reliably
Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (233396 => 233397)
--- trunk/Source/WebCore/layout/FormattingContext.cpp 2018-06-30 17:11:36 UTC (rev 233396)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp 2018-06-30 18:04:58 UTC (rev 233397)
@@ -72,7 +72,7 @@
void FormattingContext::computeOutOfFlowHorizontalGeometry(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
{
auto horizontalGeometry = Geometry::outOfFlowHorizontalGeometry(layoutContext, layoutBox);
- displayBox.setLeft(horizontalGeometry.left);
+ displayBox.setLeft(horizontalGeometry.left + horizontalGeometry.widthAndMargin.margin.left);
displayBox.setContentBoxWidth(horizontalGeometry.widthAndMargin.width);
displayBox.setHorizontalMargin(horizontalGeometry.widthAndMargin.margin);
}
@@ -80,7 +80,7 @@
void FormattingContext::computeOutOfFlowVerticalGeometry(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
{
auto verticalGeometry = Geometry::outOfFlowVerticalGeometry(layoutContext, layoutBox);
- displayBox.setTop(verticalGeometry.top);
+ displayBox.setTop(verticalGeometry.top + verticalGeometry.heightAndMargin.margin.top);
displayBox.setContentBoxHeight(verticalGeometry.heightAndMargin.height);
ASSERT(!verticalGeometry.heightAndMargin.collapsedMargin);
displayBox.setVerticalMargin(verticalGeometry.heightAndMargin.margin);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
