| 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 89b4171f5c12f358dacabc5c453a48caa51f97da..a8ada647ff74dea436bb58ed446e046995c5eaf4 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -1750,7 +1750,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
| return TextEmphasisFill::kFilled;
|
| }
|
| static TextEmphasisMark InitialTextEmphasisMark() {
|
| - return kTextEmphasisMarkNone;
|
| + return TextEmphasisMark::kNone;
|
| }
|
| static const AtomicString& InitialTextEmphasisCustomMark() {
|
| return g_null_atom;
|
| @@ -1769,7 +1769,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
| static_cast<unsigned>(fill));
|
| }
|
| void SetTextEmphasisMark(TextEmphasisMark mark) {
|
| - SET_VAR(rare_inherited_data_, text_emphasis_mark_, mark);
|
| + SET_VAR(rare_inherited_data_, text_emphasis_mark_,
|
| + static_cast<unsigned>(mark));
|
| }
|
| void SetTextEmphasisCustomMark(const AtomicString& mark) {
|
| SET_VAR(rare_inherited_data_, text_emphasis_custom_mark_, mark);
|
|
|