Make TextCombine an enum class.

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1651 matching lines @@
   void SetListStyleImage(StyleImage*);
 
   // quotes
   static QuotesData* InitialQuotes() { return 0; }
   QuotesData* Quotes() const { return rare_inherited_data_->quotes_.Get(); }
   void SetQuotes(RefPtr<QuotesData>);
 
   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
   static TextJustify InitialTextJustify() { return kTextJustifyAuto; }
   TextJustify GetTextJustify() const {
     return static_cast<TextJustify>(rare_inherited_data_->text_justify_);
   }
   void SetTextJustify(TextJustify v) {
     SET_VAR(rare_inherited_data_, text_justify_, v);
   }
@@ skipping 557 matching lines @@
     }
   }
   void SetMaskBoxImage(const NinePieceImage& b) {
     SET_VAR(rare_non_inherited_data_, mask_box_image_, b);
   }
   void SetMaskBoxImageSlicesFill(bool fill) {
     rare_non_inherited_data_.Access()->mask_box_image_.SetFill(fill);
   }
 
   // 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 {
     return rare_non_inherited_data_->grid_->grid_auto_repeat_columns_;
   }
   const Vector<GridTrackSize>& GridAutoRepeatRows() const {
     return rare_non_inherited_data_->grid_->grid_auto_repeat_rows_;
   }
   size_t GridAutoRepeatColumnsInsertionPoint() const {
     return rare_non_inherited_data_->grid_
@@ skipping 1417 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h