Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: sky/engine/core/rendering/RenderFlexibleBox.cpp

Issue 693353003: Fix margins and paddings on flex boxes. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderFlexibleBox.cpp
diff --git a/sky/engine/core/rendering/RenderFlexibleBox.cpp b/sky/engine/core/rendering/RenderFlexibleBox.cpp
index b71ae3bceae85af93a8a4f537b930410aaabe627..edf034d20b0f8e2e6fe17100e13568578cc27910 100644
--- a/sky/engine/core/rendering/RenderFlexibleBox.cpp
+++ b/sky/engine/core/rendering/RenderFlexibleBox.cpp
@@ -437,7 +437,7 @@ LayoutUnit RenderFlexibleBox::flowAwareBorderBefore() const
LayoutUnit RenderFlexibleBox::flowAwareBorderAfter() const
{
// FIXME(sky): Remove
- return borderTop();
+ return borderBottom();
}
LayoutUnit RenderFlexibleBox::flowAwarePaddingStart() const
@@ -463,7 +463,7 @@ LayoutUnit RenderFlexibleBox::flowAwarePaddingBefore() const
LayoutUnit RenderFlexibleBox::flowAwarePaddingAfter() const
{
// FIXME(sky): Remove
- return paddingTop();
+ return paddingBottom();
}
LayoutUnit RenderFlexibleBox::flowAwareMarginStartForChild(RenderBox* child) const
@@ -483,7 +483,7 @@ LayoutUnit RenderFlexibleBox::flowAwareMarginEndForChild(RenderBox* child) const
LayoutUnit RenderFlexibleBox::flowAwareMarginBeforeForChild(RenderBox* child) const
{
// FIXME(sky): Remove
- return marginTop();
+ return child->marginTop();
}
LayoutUnit RenderFlexibleBox::crossAxisMarginExtentForChild(RenderBox* child) const
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698