| 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 85beb8929917895f3efbf2782f12ee53af25a142..2cf32003112d5fe5ce1cca062f56391d06d26a00 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -1609,11 +1609,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
| void SetColor(const Color&);
|
|
|
| // hyphens
|
| - static Hyphens InitialHyphens() { return kHyphensManual; }
|
| + static Hyphens InitialHyphens() { return Hyphens::kManual; }
|
| Hyphens GetHyphens() const {
|
| return static_cast<Hyphens>(rare_inherited_data_->hyphens_);
|
| }
|
| - void SetHyphens(Hyphens h) { SET_VAR(rare_inherited_data_, hyphens_, h); }
|
| + void SetHyphens(Hyphens h) {
|
| + SET_VAR(rare_inherited_data_, hyphens_, static_cast<unsigned>(h));
|
| + }
|
|
|
| // -webkit-hyphenate-character
|
| static const AtomicString& InitialHyphenationString() { return g_null_atom; }
|
|
|