ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

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 51 matching lines @@
 #include "platform/text/BidiTextRun.h"
 #include "public/platform/Platform.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/typed_arrays/ArrayBufferContents.h"
 
 namespace blink {
 
-static const char defaultFont[] = "10px sans-serif";
-static const char inherit[] = "inherit";
-static const char rtl[] = "rtl";
-static const char ltr[] = "ltr";
-static const double TryRestoreContextInterval = 0.5;
-static const unsigned MaxTryRestoreContextAttempts = 4;
-static const double cDeviceScaleFactor = 1.0;  // Canvas is device independent
+static const char kDefaultFont[] = "10px sans-serif";
+static const char kInheritDirectionString[] = "inherit";
+static const char kRtlDirectionString[] = "rtl";
+static const char kLtrDirectionString[] = "ltr";

[Łukasz Anforowicz, 2017/01/04 22:11:24]

The 3 lines above can probably be prelanded.

+static const double kTryRestoreContextInterval = 0.5;
+static const unsigned kMaxTryRestoreContextAttempts = 4;
+static const double kCDeviceScaleFactor = 1.0;  // Canvas is device independent
 
 static bool contextLostRestoredEventsEnabled() {
   return RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled();
 }
 
 // Drawing methods need to use this instead of SkAutoCanvasRestore in case
 // overdraw detection substitutes the recording canvas (to discard overdrawn
 // draw calls).
 class CanvasRenderingContext2DAutoRestoreSkCanvas {
   STACK_ALLOCATED();
@@ skipping 594 matching lines @@
     case CanvasRenderingContext2DState::DirectionLTR:
       return TextDirection::Ltr;
   }
   ASSERT_NOT_REACHED();
   return TextDirection::Ltr;
 }
 
 String CanvasRenderingContext2D::direction() const {
   if (state().getDirection() == CanvasRenderingContext2DState::DirectionInherit)
     canvas()->document().updateStyleAndLayoutTreeForNode(canvas());
-  return toTextDirection(state().getDirection(), canvas()) == TextDirection::Rtl
-             ? rtl
-             : ltr;
+  return toTextDirection(state().getDirection(), canvas()) == TextDirection::kRtl
+             ? kRtlDirectionString
+             : kLtrDirectionString;
 }
 
 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;
+  if (direction_string == kInheritDirectionString)
+    direction = CanvasRenderingContext2DState::kDirectionInherit;
+  else if (direction_string == kRtlDirectionString)
+    direction = CanvasRenderingContext2DState::kDirectionRTL;
+  else if (direction_string == kLtrDirectionString)
+    direction = CanvasRenderingContext2DState::kDirectionLTR;
   else
     return;
 
   if (state().getDirection() == direction)
     return;
 
   modifiableState().setDirection(direction);
 }
 
 void CanvasRenderingContext2D::fillText(const String& text,
@@ skipping 443 matching lines @@
   }
   return true;
 }
 
 void CanvasRenderingContext2D::resetUsageTracking() {
   UsageCounters newCounters;
   m_usageCounters = newCounters;
 }
 
 }  // namespace blink