| 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 d5fdc10269ec0e4d38012380a99b19aed3b0a2d9..983febdf3f8ac5ec62ba86a9c8e7e535b50acf8d 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -1790,7 +1790,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
|
|
| // Text emphasis properties.
|
| static TextEmphasisFill InitialTextEmphasisFill() {
|
| - return kTextEmphasisFillFilled;
|
| + return TextEmphasisFill::kFilled;
|
| }
|
| static TextEmphasisMark InitialTextEmphasisMark() {
|
| return kTextEmphasisMarkNone;
|
| @@ -1808,7 +1808,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
| }
|
| const AtomicString& TextEmphasisMarkString() const;
|
| void SetTextEmphasisFill(TextEmphasisFill fill) {
|
| - SET_VAR(rare_inherited_data_, text_emphasis_fill_, fill);
|
| + SET_VAR(rare_inherited_data_, text_emphasis_fill_,
|
| + static_cast<unsigned>(fill));
|
| }
|
| void SetTextEmphasisMark(TextEmphasisMark mark) {
|
| SET_VAR(rare_inherited_data_, text_emphasis_mark_, mark);
|
|
|