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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 15946003: Don't stretch margin: auto items in a vertical flexbox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix vertical divs and add a test for it Created 7 years, 7 months 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 | « LayoutTests/css3/flexbox/columns-center-with-margins-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 747528e6a35f7bfebec806bbb570a3990b21849a..21a567302a7f3f696a005e02c1994ce950c2f2b5 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -2181,6 +2181,10 @@ LayoutUnit RenderBox::computeLogicalWidthInRegionUsing(SizeType widthType, Lengt
static bool flexItemHasStretchAlignment(const RenderObject* flexitem)
{
RenderObject* parent = flexitem->parent();
+ // auto margins mean we don't stretch. Note that this function will only be used for
+ // widths, so we don't have to check marginBefore/marginAfter.
ojan 2013/05/24 22:39:09 Instead of adding (or maybe in addition to) the ex
+ if (flexitem->style()->marginStart().isAuto() || flexitem->style()->marginEnd().isAuto())
+ return false;
return flexitem->style()->alignSelf() == AlignStretch || (flexitem->style()->alignSelf() == AlignAuto && parent->style()->alignItems() == AlignStretch);
}
« no previous file with comments | « LayoutTests/css3/flexbox/columns-center-with-margins-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698