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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2944793002: Make EFlexWrap an enum class. (Closed)
Patch Set: Rebase Created 3 years, 6 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: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 72973e0ceea00daec117325f8640419472b5ccbe..0091030e853e03dc496cf198a83870c362be4511 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2911,7 +2911,8 @@ bool LayoutBox::IsStretchingColumnFlexItem() const {
// We don't stretch multiline flexboxes because they need to apply line
// spacing (align-content) first.
- if (parent->IsFlexibleBox() && parent->Style()->FlexWrap() == kFlexNoWrap &&
+ if (parent->IsFlexibleBox() &&
+ parent->Style()->FlexWrap() == EFlexWrap::kNowrap &&
parent->Style()->IsColumnFlexDirection() &&
ColumnFlexItemHasStretchAlignment())
return true;
@@ -2960,7 +2961,7 @@ bool LayoutBox::SizesLogicalWidthToFitContent(
// For multiline columns, we need to apply align-content first, so we can't
// stretch now.
if (!Parent()->Style()->IsColumnFlexDirection() ||
- Parent()->Style()->FlexWrap() != kFlexNoWrap)
+ Parent()->Style()->FlexWrap() != EFlexWrap::kNowrap)
return true;
if (!ColumnFlexItemHasStretchAlignment())
return true;

Powered by Google App Engine
This is Rietveld 408576698