| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index 9c4ca01f782828986c678906f8ff8921cfc6a652..5fa6f493bc7862ad41cdc5ed0c2c9360b435af33 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -770,13 +770,14 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
|
|
| // flex-wrap (aka -webkit-flex-wrap)
|
| - static EFlexWrap InitialFlexWrap() { return kFlexNoWrap; }
|
| + static EFlexWrap InitialFlexWrap() { return EFlexWrap::kNowrap; }
|
| EFlexWrap FlexWrap() const {
|
| return static_cast<EFlexWrap>(
|
| rare_non_inherited_data_->flexible_box_data_->flex_wrap_);
|
| }
|
| void SetFlexWrap(EFlexWrap w) {
|
| - SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_wrap_, w);
|
| + SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_wrap_,
|
| + static_cast<unsigned>(w));
|
| }
|
|
|
| // -webkit-box-ordinal-group
|
|
|