| 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 74f2435d204fad85f976a3cbe27f5e45a72ba15d..03a0c7979bf42bcd819eea9b8c9a51af9e06aaf0 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -1861,12 +1861,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
|
|
| // -webkit-line-break
|
| - static LineBreak InitialLineBreak() { return kLineBreakAuto; }
|
| + static LineBreak InitialLineBreak() { return LineBreak::kAuto; }
|
| LineBreak GetLineBreak() const {
|
| return static_cast<LineBreak>(rare_inherited_data_->line_break_);
|
| }
|
| void SetLineBreak(LineBreak b) {
|
| - SET_VAR(rare_inherited_data_, line_break_, b);
|
| + SET_VAR(rare_inherited_data_, line_break_, static_cast<unsigned>(b));
|
| }
|
|
|
| // Text emphasis properties.
|
| @@ -3397,7 +3397,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
| bool BreakOnlyAfterWhiteSpace() const {
|
| return WhiteSpace() == EWhiteSpace::kPreWrap ||
|
| - GetLineBreak() == kLineBreakAfterWhiteSpace;
|
| + GetLineBreak() == LineBreak::kAfterWhiteSpace;
|
| }
|
|
|
| bool BreakWords() const {
|
|
|