Make TextEmphasisMark an enum class.

third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 115 matching lines @@
     bool should_clear_descendants_have_same_line_height_and_baseline = false;
     if (child->GetLineLayoutItem().IsAtomicInlineLevel()) {
       should_clear_descendants_have_same_line_height_and_baseline = true;
     } else if (child->IsText()) {
       if (child->GetLineLayoutItem().IsBR() ||
           (child->GetLineLayoutItem().Parent() != GetLineLayoutItem())) {
         if (!HasIdenticalLineHeightProperties(parent_style, child_style, root))
           should_clear_descendants_have_same_line_height_and_baseline = true;
       }
       if (child_style.HasTextCombine() ||
-          child_style.GetTextEmphasisMark() != kTextEmphasisMarkNone)
+          child_style.GetTextEmphasisMark() != TextEmphasisMark::kNone)
         should_clear_descendants_have_same_line_height_and_baseline = true;
     } else {
       if (child->GetLineLayoutItem().IsBR()) {
         // FIXME: This is dumb. We only turn off because current layout test
         // results expect the <br> to be 0-height on the baseline.
         // Other than making a zillion tests have to regenerate results, there's
         // no reason to ditch the optimization here.
         should_clear_descendants_have_same_line_height_and_baseline = true;
       } else {
         DCHECK(IsInlineFlowBox());
@@ skipping 12 matching lines @@
 
     if (should_clear_descendants_have_same_line_height_and_baseline)
       ClearDescendantsHaveSameLineHeightAndBaseline();
   }
 
   if (!child->GetLineLayoutItem().IsOutOfFlowPositioned()) {
     if (child->IsText()) {
       const ComputedStyle& child_style =
           child->GetLineLayoutItem().StyleRef(IsFirstLineStyle());
       if (child_style.LetterSpacing() < 0 || child_style.TextShadow() ||
-          child_style.GetTextEmphasisMark() != kTextEmphasisMarkNone ||
+          child_style.GetTextEmphasisMark() != TextEmphasisMark::kNone ||
           child_style.TextStrokeWidth())
         child->ClearKnownToHaveNoOverflow();
     } else if (child->GetLineLayoutItem().IsAtomicInlineLevel()) {
       LineLayoutBox box = LineLayoutBox(child->GetLineLayoutItem());
       if (box.HasOverflowModel() || box.HasSelfPaintingLayer())
         child->ClearKnownToHaveNoOverflow();
     } else if (!child->GetLineLayoutItem().IsBR() &&
                (child->GetLineLayoutItem()
                     .Style(IsFirstLineStyle())
                     ->BoxShadow() ||
@@ skipping 860 matching lines @@
   float left_glyph_edge = glyph_overflow ? glyph_overflow->left : 0;
   float right_glyph_edge = glyph_overflow ? glyph_overflow->right : 0;
 
   float stroke_overflow = style.TextStrokeWidth() / 2.0f;
   float top_glyph_overflow = -stroke_overflow - top_glyph_edge;
   float bottom_glyph_overflow = stroke_overflow + bottom_glyph_edge;
   float left_glyph_overflow = -stroke_overflow - left_glyph_edge;
   float right_glyph_overflow = stroke_overflow + right_glyph_edge;
 
   TextEmphasisPosition emphasis_mark_position;
-  if (style.GetTextEmphasisMark() != kTextEmphasisMarkNone &&
+  if (style.GetTextEmphasisMark() != TextEmphasisMark::kNone &&
       text_box->GetEmphasisMarkPosition(style, emphasis_mark_position)) {
     float emphasis_mark_height =
         style.GetFont().EmphasisMarkHeight(style.TextEmphasisMarkString());
     if ((emphasis_mark_position == TextEmphasisPosition::kOver) ==
         (!style.IsFlippedLinesWritingMode()))
       top_glyph_overflow = std::min(top_glyph_overflow, -emphasis_mark_height);
     else
       bottom_glyph_overflow =
           std::max(bottom_glyph_overflow, emphasis_mark_height);
   }
@@ skipping 478 matching lines @@
         bottom_of_last_ruby_text_line += curr->LogicalTop();
         result =
             std::max(result, bottom_of_last_ruby_text_line - allowed_position);
       }
     }
 
     if (curr->IsInlineTextBox()) {
       const ComputedStyle& style =
           curr->GetLineLayoutItem().StyleRef(IsFirstLineStyle());
       TextEmphasisPosition emphasis_mark_position;
-      if (style.GetTextEmphasisMark() != kTextEmphasisMarkNone &&
+      if (style.GetTextEmphasisMark() != TextEmphasisMark::kNone &&
           ToInlineTextBox(curr)->GetEmphasisMarkPosition(
               style, emphasis_mark_position) &&
           emphasis_mark_position == TextEmphasisPosition::kOver) {
         if (!style.IsFlippedLinesWritingMode()) {
           int top_of_emphasis_mark =
               (curr->LogicalTop() - style.GetFont().EmphasisMarkHeight(
                                         style.TextEmphasisMarkString()))
                   .ToInt();
           result = std::max(result, allowed_position - top_of_emphasis_mark);
         } else {
@@ skipping 49 matching lines @@
           continue;
         bottom_of_last_ruby_text_line += curr->LogicalTop();
         result =
             std::max(result, bottom_of_last_ruby_text_line - allowed_position);
       }
     }
 
     if (curr->IsInlineTextBox()) {
       const ComputedStyle& style =
           curr->GetLineLayoutItem().StyleRef(IsFirstLineStyle());
-      if (style.GetTextEmphasisMark() != kTextEmphasisMarkNone &&
+      if (style.GetTextEmphasisMark() != TextEmphasisMark::kNone &&
           style.GetTextEmphasisPosition() == TextEmphasisPosition::kUnder) {
         if (!style.IsFlippedLinesWritingMode()) {
           LayoutUnit bottom_of_emphasis_mark =
               curr->LogicalBottom() + style.GetFont().EmphasisMarkHeight(
                                           style.TextEmphasisMarkString());
           result = std::max(result, bottom_of_emphasis_mark - allowed_position);
         } else {
           LayoutUnit top_of_emphasis_mark =
               curr->LogicalTop() - style.GetFont().EmphasisMarkHeight(
                                        style.TextEmphasisMarkString());
@@ skipping 77 matching lines @@
   InlineBox::ShowLineTreeAndMark(marked_box1, marked_label1, marked_box2,
                                  marked_label2, obj, depth);
   for (const InlineBox* box = FirstChild(); box; box = box->NextOnLine())
     box->ShowLineTreeAndMark(marked_box1, marked_label1, marked_box2,
                              marked_label2, obj, depth + 1);
 }
 
 #endif
 
 }  // namespace blink