Changed TextDirection to an enum class and renamed its members

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 1066 matching lines @@
 
   Hyphenation* hyphenation = styleToUse.getHyphenation();
   bool disableSoftHyphen = styleToUse.getHyphens() == HyphensNone;
   float maxWordWidth = 0;
   if (!hyphenation)
     maxWordWidth = std::numeric_limits<float>::infinity();
 
   BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver;
   BidiCharacterRun* run;
   TextDirection textDirection = styleToUse.direction();
-  if ((is8Bit() && textDirection == LTR) ||
+  if ((is8Bit() && textDirection == TextDirection::Ltr) ||
       isOverride(styleToUse.unicodeBidi())) {
     run = 0;
   } else {
     TextRun textRun(text());
     BidiStatus status(textDirection, false);
     bidiResolver.setStatus(status);
     bidiResolver.setPositionIgnoringNestedIsolates(
         TextRunIterator(&textRun, 0));
     bool hardLineBreak = false;
     bool reorderRuns = false;
@@ skipping 92 matching lines @@
       j = std::min(j, run->stop() + 1);
     int wordLen = j - i;
     if (wordLen) {
       bool isSpace = (j < len) && c == spaceCharacter;
 
       // Non-zero only when kerning is enabled, in which case we measure words
       // with their trailing space, then subtract its width.
       float wordTrailingSpaceWidth = 0;
       if (isSpace &&
           (f.getFontDescription().getTypesettingFeatures() & Kerning)) {
-        ASSERT(textDirection >= 0 && textDirection <= 1);
-        if (!cachedWordTrailingSpaceWidth[textDirection])
-          cachedWordTrailingSpaceWidth[textDirection] =
+        unsigned textDirectionIndex = static_cast<unsigned>(textDirection);

[napper, 2016/12/07 05:27:13]

const unsigned textDirectionIndex = static_cast<unsigned>(textDirection);

[sashab, 2016/12/07 05:40:26]

Done

+        DCHECK_GE(textDirectionIndex, 0U);
+        DCHECK_LE(textDirectionIndex, 1U);
+        if (!cachedWordTrailingSpaceWidth[textDirectionIndex])
+          cachedWordTrailingSpaceWidth[textDirectionIndex] =
               f.width(constructTextRun(f, &spaceCharacter, 1, styleToUse,
                                        textDirection)) +
               wordSpacing;
-        wordTrailingSpaceWidth = cachedWordTrailingSpaceWidth[textDirection];
+        wordTrailingSpaceWidth =
+            cachedWordTrailingSpaceWidth[textDirectionIndex];
       }
 
       float w;
       if (wordTrailingSpaceWidth && isSpace) {
         w = widthFromFont(f, i, wordLen + 1, leadWidth, currMaxWidth,
                           textDirection, &fallbackFonts, &glyphBounds) -
             wordTrailingSpaceWidth;
       } else {
         w = widthFromFont(f, i, wordLen, leadWidth, currMaxWidth, textDirection,
                           &fallbackFonts, &glyphBounds);
@@ skipping 758 matching lines @@
   LayoutRect rect = LayoutRect(
       IntRect(firstRunX(), firstRunY(), linesBox.width(), linesBox.height()));
   LayoutBlock* block = containingBlock();
   if (block && hasTextBoxes())
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink