Make TextEmphasisMark an enum class.

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 1517 matching lines @@
   DEFINE_STATIC_LOCAL(AtomicString, hyphen_string, (&kHyphenCharacter, 1));
   const SimpleFontData* primary_font = GetFont().PrimaryFont();
   DCHECK(primary_font);
   return primary_font && primary_font->GlyphForCharacter(kHyphenCharacter)
              ? hyphen_string
              : hyphen_minus_string;
 }
 
 const AtomicString& ComputedStyle::TextEmphasisMarkString() const {
   switch (GetTextEmphasisMark()) {
-    case kTextEmphasisMarkNone:
+    case TextEmphasisMark::kNone:
       return g_null_atom;
-    case kTextEmphasisMarkCustom:
+    case TextEmphasisMark::kCustom:
       return TextEmphasisCustomMark();
-    case kTextEmphasisMarkDot: {
+    case TextEmphasisMark::kDot: {
       DEFINE_STATIC_LOCAL(AtomicString, filled_dot_string,
                           (&kBulletCharacter, 1));
       DEFINE_STATIC_LOCAL(AtomicString, open_dot_string,
                           (&kWhiteBulletCharacter, 1));
       return GetTextEmphasisFill() == TextEmphasisFill::kFilled
                  ? filled_dot_string
                  : open_dot_string;
     }
-    case kTextEmphasisMarkCircle: {
+    case TextEmphasisMark::kCircle: {
       DEFINE_STATIC_LOCAL(AtomicString, filled_circle_string,
                           (&kBlackCircleCharacter, 1));
       DEFINE_STATIC_LOCAL(AtomicString, open_circle_string,
                           (&kWhiteCircleCharacter, 1));
       return GetTextEmphasisFill() == TextEmphasisFill::kFilled
                  ? filled_circle_string
                  : open_circle_string;
     }
-    case kTextEmphasisMarkDoubleCircle: {
+    case TextEmphasisMark::kDoubleCircle: {
       DEFINE_STATIC_LOCAL(AtomicString, filled_double_circle_string,
                           (&kFisheyeCharacter, 1));
       DEFINE_STATIC_LOCAL(AtomicString, open_double_circle_string,
                           (&kBullseyeCharacter, 1));
       return GetTextEmphasisFill() == TextEmphasisFill::kFilled
                  ? filled_double_circle_string
                  : open_double_circle_string;
     }
-    case kTextEmphasisMarkTriangle: {
+    case TextEmphasisMark::kTriangle: {
       DEFINE_STATIC_LOCAL(AtomicString, filled_triangle_string,
                           (&kBlackUpPointingTriangleCharacter, 1));
       DEFINE_STATIC_LOCAL(AtomicString, open_triangle_string,
                           (&kWhiteUpPointingTriangleCharacter, 1));
       return GetTextEmphasisFill() == TextEmphasisFill::kFilled
                  ? filled_triangle_string
                  : open_triangle_string;
     }
-    case kTextEmphasisMarkSesame: {
+    case TextEmphasisMark::kSesame: {
       DEFINE_STATIC_LOCAL(AtomicString, filled_sesame_string,
                           (&kSesameDotCharacter, 1));
       DEFINE_STATIC_LOCAL(AtomicString, open_sesame_string,
                           (&kWhiteSesameDotCharacter, 1));
       return GetTextEmphasisFill() == TextEmphasisFill::kFilled
                  ? filled_sesame_string
                  : open_sesame_string;
     }
-    case kTextEmphasisMarkAuto:
+    case TextEmphasisMark::kAuto:
       NOTREACHED();
       return g_null_atom;
   }
 
   NOTREACHED();
   return g_null_atom;
 }
 
 CSSAnimationData& ComputedStyle::AccessAnimations() {
   if (!rare_non_inherited_data_.Access()->animations_)
@@ skipping 676 matching lines @@
     const ComputedStyle* other_style) const {
   return ColumnRuleStyle() == other_style->ColumnRuleStyle() &&
          ColumnRuleWidth() == other_style->ColumnRuleWidth() &&
          VisitedDependentColor(CSSPropertyColumnRuleColor) ==
              other_style->VisitedDependentColor(CSSPropertyColumnRuleColor);
 }
 
 TextEmphasisMark ComputedStyle::GetTextEmphasisMark() const {
   TextEmphasisMark mark =
       static_cast<TextEmphasisMark>(rare_inherited_data_->text_emphasis_mark_);
-  if (mark != kTextEmphasisMarkAuto)
+  if (mark != TextEmphasisMark::kAuto)
     return mark;
 
   if (IsHorizontalWritingMode())
-    return kTextEmphasisMarkDot;
+    return TextEmphasisMark::kDot;
 
-  return kTextEmphasisMarkSesame;
+  return TextEmphasisMark::kSesame;
 }
 
 Color ComputedStyle::InitialTapHighlightColor() {
   return LayoutTheme::TapHighlightColor();
 }
 
 const FilterOperations& ComputedStyle::InitialFilter() {
   DEFINE_STATIC_LOCAL(FilterOperationsWrapper, ops,
                       (FilterOperationsWrapper::Create()));
   return ops.Operations();
@@ skipping 129 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink