Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(730)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2900633003: Make TextEmphasisMark an enum class. (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/InlineTextBox.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698