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

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

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
index 05a111718b7d39b02404da3c695cd4f57ea6f131..c1e9f70c207a2ac63131e04e32eed10e581779df 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
@@ -69,13 +69,13 @@
 
 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();
@@ -690,19 +690,19 @@ static inline TextDirection toTextDirection(
 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;