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

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

Issue 290823003: Chrome incorrectly honors "align-content" in "flex-wrap: wrap" flex containers that only have a sin… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
Index: Source/core/rendering/RenderFlexibleBox.cpp
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
index 2395e4a874a331f929f40bc64fa489fd9b48fc2c..fe43b7befe5ff56e3f46629e5186283369d92a7b 100644
--- a/Source/core/rendering/RenderFlexibleBox.cpp
+++ b/Source/core/rendering/RenderFlexibleBox.cpp
@@ -1209,15 +1209,17 @@ void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children,
static LayoutUnit initialAlignContentOffset(LayoutUnit availableFreeSpace, EAlignContent alignContent, unsigned numberOfLines)
{
- if (alignContent == AlignContentFlexEnd)
- return availableFreeSpace;
- if (alignContent == AlignContentCenter)
- return availableFreeSpace / 2;
- if (alignContent == AlignContentSpaceAround) {
- if (availableFreeSpace > 0 && numberOfLines)
- return availableFreeSpace / (2 * numberOfLines);
- if (availableFreeSpace < 0)
+ if (numberOfLines > 1) {
tony 2014/05/19 16:43:45 Nit: I would early return so there's less indentio
harpreet.sk 2014/05/20 07:39:43 Done.
+ if (alignContent == AlignContentFlexEnd)
+ return availableFreeSpace;
+ if (alignContent == AlignContentCenter)
return availableFreeSpace / 2;
+ if (alignContent == AlignContentSpaceAround) {
+ if (availableFreeSpace > 0 && numberOfLines)
+ return availableFreeSpace / (2 * numberOfLines);
+ if (availableFreeSpace < 0)
+ return availableFreeSpace / 2;
+ }
}
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698