Make TextCombine an enum class.

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

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 aec4bd46d6b9d3bdc12a756d13a7e73a06934c55..7d952e6a36fc6fa586890bd12ad72aa14f27244b 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -1669,12 +1669,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
   bool QuotesDataEquivalent(const ComputedStyle&) const;
 
   // text-combine-upright (aka -webkit-text-combine, -epub-text-combine)
-  static TextCombine InitialTextCombine() { return kTextCombineNone; }
+  static TextCombine InitialTextCombine() { return TextCombine::kNone; }
   TextCombine GetTextCombine() const {
     return static_cast<TextCombine>(rare_inherited_data_->text_combine_);
   }
   void SetTextCombine(TextCombine v) {
-    SET_VAR(rare_inherited_data_, text_combine_, v);
+    SET_VAR(rare_inherited_data_, text_combine_, static_cast<unsigned>(v));
   }
 
   // text-justify
@@ -2252,7 +2252,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
   }
 
   // Text-combine utility functions.
-  bool HasTextCombine() const { return GetTextCombine() != kTextCombineNone; }
+  bool HasTextCombine() const { return GetTextCombine() != TextCombine::kNone; }
 
   // Grid utility functions.
   const Vector<GridTrackSize>& GridAutoRepeatColumns() const {