Make TextDecoration an enum class.

third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/SVGInlineTextBoxPainter.h"
 
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutTheme.h"
@@ skipping 162 matching lines @@
       state_saver.Save();
       paint_info.context.ConcatCTM(fragment.BuildFragmentTransform());
     }
 
     // Spec: All text decorations except line-through should be drawn before the
     // text is filled and stroked; thus, the text is rendered on top of these
     // decorations.
     const Vector<AppliedTextDecoration>& decorations =
         style.AppliedTextDecorations();
     for (const AppliedTextDecoration& decoration : decorations) {
-      if (decoration.Lines() & kTextDecorationUnderline)
-        PaintDecoration(paint_info, kTextDecorationUnderline, fragment);
-      if (decoration.Lines() & kTextDecorationOverline)
-        PaintDecoration(paint_info, kTextDecorationOverline, fragment);
+      if (EnumHasFlags(decoration.Lines(), TextDecoration::kUnderline))
+        PaintDecoration(paint_info, TextDecoration::kUnderline, fragment);
+      if (EnumHasFlags(decoration.Lines(), TextDecoration::kOverline))
+        PaintDecoration(paint_info, TextDecoration::kOverline, fragment);
     }
 
     for (int i = 0; i < 3; i++) {
       switch (svg_style.PaintOrderType(i)) {
         case PT_FILL:
           if (has_fill)
             PaintText(paint_info, style, *selection_style, fragment,
                       kApplyToFillMode, should_paint_selection);
           break;
         case PT_STROKE:
           if (has_visible_stroke)
             PaintText(paint_info, style, *selection_style, fragment,
                       kApplyToStrokeMode, should_paint_selection);
           break;
         case PT_MARKERS:
           // Markers don't apply to text
           break;
         default:
           NOTREACHED();
           break;
       }
     }
 
     // Spec: Line-through should be drawn after the text is filled and stroked;
     // thus, the line-through is rendered on top of the text.
     for (const AppliedTextDecoration& decoration : decorations) {
-      if (decoration.Lines() & kTextDecorationLineThrough)
-        PaintDecoration(paint_info, kTextDecorationLineThrough, fragment);
+      if (EnumHasFlags(decoration.Lines(), TextDecoration::kLineThrough))
+        PaintDecoration(paint_info, TextDecoration::kLineThrough, fragment);
     }
   }
 }
 
 void SVGInlineTextBoxPainter::PaintSelectionBackground(
     const PaintInfo& paint_info) {
   if (svg_inline_text_box_.GetLineLayoutItem().Style()->Visibility() !=
       EVisibility::kVisible)
     return;
 
@@ skipping 39 matching lines @@
 static inline LayoutObject* FindLayoutObjectDefininingTextDecoration(
     InlineFlowBox* parent_box) {
   // Lookup first layout object in parent hierarchy which has text-decoration
   // set.
   LayoutObject* layout_object = nullptr;
   while (parent_box) {
     layout_object =
         LineLayoutAPIShim::LayoutObjectFrom(parent_box->GetLineLayoutItem());
 
     if (layout_object->Style() &&
-        layout_object->Style()->GetTextDecoration() != kTextDecorationNone)
+        layout_object->Style()->GetTextDecoration() != TextDecoration::kNone)
       break;
 
     parent_box = parent_box->Parent();
   }
 
   DCHECK(layout_object);
   return layout_object;
 }
 
 // Offset from the baseline for |decoration|. Positive offsets are above the
 // baseline.
 static inline float BaselineOffsetForDecoration(TextDecoration decoration,
                                                 const FontMetrics& font_metrics,
                                                 float thickness) {
   // FIXME: For SVG Fonts we need to use the attributes defined in the
   // <font-face> if specified.
   // Compatible with Batik/Presto.
-  if (decoration == kTextDecorationUnderline)
+  if (decoration == TextDecoration::kUnderline)
     return -thickness * 1.5f;
-  if (decoration == kTextDecorationOverline)
+  if (decoration == TextDecoration::kOverline)
     return font_metrics.FloatAscent() - thickness;
-  if (decoration == kTextDecorationLineThrough)
+  if (decoration == TextDecoration::kLineThrough)
     return font_metrics.FloatAscent() * 3 / 8.0f;
 
   NOTREACHED();
   return 0.0f;
 }
 
 static inline float ThicknessForDecoration(TextDecoration, const Font& font) {
   // FIXME: For SVG Fonts we need to use the attributes defined in the
   // <font-face> if specified.
   // Compatible with Batik/Presto
   return font.GetFontDescription().ComputedSize() / 20.0f;
 }
 
 void SVGInlineTextBoxPainter::PaintDecoration(const PaintInfo& paint_info,
                                               TextDecoration decoration,
                                               const SVGTextFragment& fragment) {
   if (svg_inline_text_box_.GetLineLayoutItem()
           .Style()
-          ->TextDecorationsInEffect() == kTextDecorationNone)
+          ->TextDecorationsInEffect() == TextDecoration::kNone)
     return;
 
   if (fragment.width <= 0)
     return;
 
   // Find out which style defined the text-decoration, as its fill/stroke
   // properties have to be used for drawing instead of ours.
   LayoutObject* decoration_layout_object =
       FindLayoutObjectDefininingTextDecoration(svg_inline_text_box_.Parent());
   const ComputedStyle& decoration_style = decoration_layout_object->StyleRef();
@@ skipping 328 matching lines @@
     }
     FloatRect fragment_rect = svg_inline_text_box_.SelectionRectForTextFragment(
         fragment, text_match_info.start_position, text_match_info.end_position,
         style);
     paint_info.context.SetFillColor(color);
     paint_info.context.FillRect(fragment_rect);
   }
 }
 
 }  // namespace blink