Changed TextDirection to an enum class and renamed its members

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
@@ skipping 659 matching lines @@
     const ComputedStyle** computedStyle = 0) {
   const ComputedStyle* style =
       (computedStyle ||
        direction == CanvasRenderingContext2DState::DirectionInherit)
           ? canvas->ensureComputedStyle()
           : nullptr;
   if (computedStyle)
     *computedStyle = style;
   switch (direction) {
     case CanvasRenderingContext2DState::DirectionInherit:
-      return style ? style->direction() : LTR;
+      return style ? style->direction() : TextDirection::Ltr;
     case CanvasRenderingContext2DState::DirectionRTL:
-      return RTL;
+      return TextDirection::Rtl;
     case CanvasRenderingContext2DState::DirectionLTR:
-      return LTR;
+      return TextDirection::Ltr;
   }
   ASSERT_NOT_REACHED();
-  return LTR;
+  return TextDirection::Ltr;
 }
 
 String CanvasRenderingContext2D::direction() const {
   if (state().getDirection() == CanvasRenderingContext2DState::DirectionInherit)
     canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
-  return toTextDirection(state().getDirection(), canvas()) == RTL ? rtl : ltr;
+  return toTextDirection(state().getDirection(), canvas()) == TextDirection::Rtl
+             ? rtl
+             : ltr;
 }
 
 void CanvasRenderingContext2D::setDirection(const String& directionString) {
   CanvasRenderingContext2DState::Direction direction;
   if (directionString == inherit)
     direction = CanvasRenderingContext2DState::DirectionInherit;
   else if (directionString == rtl)
     direction = CanvasRenderingContext2DState::DirectionRTL;
   else if (directionString == ltr)
     direction = CanvasRenderingContext2DState::DirectionLTR;
@@ skipping 133 matching lines @@
   DCHECK(fontData);
   if (!fontData)
     return;
   const FontMetrics& fontMetrics = fontData->getFontMetrics();
 
   // FIXME: Need to turn off font smoothing.
 
   const ComputedStyle* computedStyle = 0;
   TextDirection direction =
       toTextDirection(state().getDirection(), canvas(), &computedStyle);
-  bool isRTL = direction == RTL;
+  bool isRTL = direction == TextDirection::Rtl;
   bool override =
       computedStyle ? isOverride(computedStyle->unicodeBidi()) : false;
 
   TextRun textRun(text, 0, 0, TextRun::AllowTrailingExpansion, direction,
                   override);
   textRun.setNormalizeSpace(true);
   // Draw the item text at the correct point.
   FloatPoint location(x, y + getFontBaseline(fontMetrics));
   double fontWidth = font.width(textRun);
 
@@ skipping 299 matching lines @@
   }
   return true;
 }
 
 void CanvasRenderingContext2D::resetUsageTracking() {
   UsageCounters newCounters;
   m_usageCounters = newCounters;
 }
 
 }  // namespace blink