Make TextDecoration an enum class.

third_party/WebKit/Source/core/style/ComputedStyle.cpp

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 2fa033db5432a20938b2671dcaa246f17912a2e5..0f88d4bcf48d9a48f4758a4bc93cb6757606bd69 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1709,18 +1709,18 @@ FontStretch ComputedStyle::GetFontStretch() const {
 
 TextDecoration ComputedStyle::TextDecorationsInEffect() const {
   if (HasSimpleUnderlineInternal())
-    return kTextDecorationUnderline;
+    return TextDecoration::kUnderline;
   if (!rare_inherited_data_->applied_text_decorations)
-    return kTextDecorationNone;
+    return TextDecoration::kNone;
 
-  int decorations = 0;
+  TextDecoration decorations = TextDecoration::kNone;

[Bugs Nash, 2017/04/27 00:02:23]

yass

[shend, 2017/04/27 00:27:33]

yes

 
   const Vector<AppliedTextDecoration>& applied = AppliedTextDecorations();
 
   for (size_t i = 0; i < applied.size(); ++i)
     decorations |= applied[i].Lines();
 
-  return static_cast<TextDecoration>(decorations);
+  return decorations;
 }
 
 const Vector<AppliedTextDecoration>& ComputedStyle::AppliedTextDecorations()
@@ -1729,7 +1729,7 @@ const Vector<AppliedTextDecoration>& ComputedStyle::AppliedTextDecorations()
     DEFINE_STATIC_LOCAL(
         Vector<AppliedTextDecoration>, underline,
         (1, AppliedTextDecoration(
-                kTextDecorationUnderline, kTextDecorationStyleSolid,
+                TextDecoration::kUnderline, kTextDecorationStyleSolid,
                 VisitedDependentColor(CSSPropertyTextDecorationColor))));
     // Since we only have one of these in memory, just update the color before
     // returning.
@@ -2012,7 +2012,7 @@ void ComputedStyle::OverrideTextDecorationColors(Color override_color) {
 void ComputedStyle::ApplyTextDecorations(
     const Color& parent_text_decoration_color,
     bool override_existing_colors) {
-  if (GetTextDecoration() == kTextDecorationNone &&
+  if (GetTextDecoration() == TextDecoration::kNone &&
       !HasSimpleUnderlineInternal() &&
       !rare_inherited_data_->applied_text_decorations)
     return;
@@ -2022,24 +2022,24 @@ void ComputedStyle::ApplyTextDecorations(
   Color current_text_decoration_color =
       VisitedDependentColor(CSSPropertyTextDecorationColor);
   if (HasSimpleUnderlineInternal() &&
-      (GetTextDecoration() != kTextDecorationNone ||
+      (GetTextDecoration() != TextDecoration::kNone ||
        current_text_decoration_color != parent_text_decoration_color)) {
     SetHasSimpleUnderlineInternal(false);
     AddAppliedTextDecoration(AppliedTextDecoration(
-        kTextDecorationUnderline, kTextDecorationStyleSolid,
+        TextDecoration::kUnderline, kTextDecorationStyleSolid,
         parent_text_decoration_color));
   }
   if (override_existing_colors &&
       rare_inherited_data_->applied_text_decorations)
     OverrideTextDecorationColors(current_text_decoration_color);
-  if (GetTextDecoration() == kTextDecorationNone)
+  if (GetTextDecoration() == TextDecoration::kNone)
     return;
   DCHECK(!HasSimpleUnderlineInternal());
   // To save memory, we don't use AppliedTextDecoration objects in the common
   // case of a single simple underline of currentColor.
   TextDecoration decoration_lines = GetTextDecoration();
   TextDecorationStyle decoration_style = GetTextDecorationStyle();
-  bool is_simple_underline = decoration_lines == kTextDecorationUnderline &&
+  bool is_simple_underline = decoration_lines == TextDecoration::kUnderline &&
                              decoration_style == kTextDecorationStyleSolid &&
                              TextDecorationColor().IsCurrentColor();
   if (is_simple_underline && !rare_inherited_data_->applied_text_decorations) {