Make EWordBreak an enum class.

third_party/WebKit/Source/core/layout/LayoutText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * 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
  * License as published by the Free Software Foundation; either
@@ skipping 1001 matching lines @@
     int length,
     EWordBreak break_all_or_break_word) {
   DCHECK_GT(length, 0);
   LazyLineBreakIterator break_iterator(layout_text->GetText(),
                                        style.LocaleForLineBreakIterator());
   int next_breakable = -1;
   float min = std::numeric_limits<float>::max();
   int end = start + length;
   for (int i = start; i < end;) {
     int fragment_length;
-    if (break_all_or_break_word == EWordBreak::kBreakAllWordBreak) {
+    if (break_all_or_break_word == EWordBreak::kBreakAll) {
       break_iterator.IsBreakable(i + 1, next_breakable,
                                  LineBreakType::kBreakAll);
       fragment_length = (next_breakable > i ? next_breakable : length) - i;
     } else {
       fragment_length = U16_LENGTH(layout_text->CodepointAt(i));
     }
 
     // Ensure that malformed surrogate pairs don't cause us to read
     // past the end of the string.
     int text_length = layout_text->TextLength();
@@ skipping 82 matching lines @@
       text_, style_to_use.LocaleForLineBreakIterator());
   bool needs_word_spacing = false;
   bool ignoring_spaces = false;
   bool is_space = false;
   bool first_word = true;
   bool first_line = true;
   int next_breakable = -1;
   int last_word_boundary = 0;
   float cached_word_trailing_space_width[2] = {0, 0};  // LTR, RTL
 
-  EWordBreak break_all_or_break_word = EWordBreak::kNormalWordBreak;
+  EWordBreak break_all_or_break_word = EWordBreak::kNormal;
   LineBreakType line_break_type = LineBreakType::kNormal;
   if (style_to_use.AutoWrap()) {
-    if (style_to_use.WordBreak() == kBreakAllWordBreak ||
-        style_to_use.WordBreak() == kBreakWordBreak) {
+    if (style_to_use.WordBreak() == EWordBreak::kBreakAll ||
+        style_to_use.WordBreak() == EWordBreak::kBreakWord) {
       break_all_or_break_word = style_to_use.WordBreak();
-    } else if (style_to_use.WordBreak() == kKeepAllWordBreak) {
+    } else if (style_to_use.WordBreak() == EWordBreak::kKeepAll) {
       line_break_type = LineBreakType::kKeepAll;
     }
   }
 
   Hyphenation* hyphenation =
       style_to_use.AutoWrap() ? style_to_use.GetHyphenation() : nullptr;
   bool disable_soft_hyphen = style_to_use.GetHyphens() == Hyphens::kNone;
   float max_word_width = 0;
   if (!hyphenation)
     max_word_width = std::numeric_limits<float>::infinity();
@@ skipping 158 matching lines @@
                 f, i + suffix_start, word_len - suffix_start, lead_width,
                 curr_max_width, text_direction, &fallback_fonts, &glyph_bounds);
           max_fragment_width = std::max(max_fragment_width, suffix_width);
           curr_min_width += max_fragment_width - w;
           max_word_width = std::max(max_word_width, max_fragment_width);
         } else {
           max_word_width = w;
         }
       }
 
-      if (break_all_or_break_word != EWordBreak::kNormalWordBreak) {
+      if (break_all_or_break_word != EWordBreak::kNormal) {
         // Because sum of character widths may not be equal to the word width,
         // we need to measure twice; once with normal break for max width,
         // another with break-all for min width.
         curr_min_width = MinWordFragmentWidthForBreakAll(
             this, style_to_use, f, text_direction, i, word_len,
             break_all_or_break_word);
       } else {
         curr_min_width += w;
       }
       if (between_words) {
@@ skipping 728 matching lines @@
   LayoutRect rect = LayoutRect(
       IntRect(FirstRunX(), FirstRunY(), lines_box.Width(), lines_box.Height()));
   LayoutBlock* block = ContainingBlock();
   if (block && HasTextBoxes())
     block->AdjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink