Convert SkiaBitLocker to use PaintCanvas

third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm

Index: third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
diff --git a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
index 39925f7a5ce78f6992cd8ccc41abecc3fa968e3a..1677c437499801822cb2557ec16bc7a59785baef 100644
--- a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
+++ b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
@@ -49,7 +49,7 @@ LocalCurrentGraphicsContext::LocalCurrentGraphicsContext(
     const IntRect& dirtyRect)
     : m_didSetGraphicsContext(false),
       m_inflatedDirtyRect(ThemeMac::inflateRectForAA(dirtyRect)),
-      m_skiaBitLocker(canvas, m_inflatedDirtyRect, deviceScaleFactor) {
+      m_graphicsContextCanvas(canvas, m_inflatedDirtyRect, deviceScaleFactor) {
   m_savedCanvas = canvas;
   canvas->save();
 
@@ -87,7 +87,7 @@ LocalCurrentGraphicsContext::~LocalCurrentGraphicsContext() {
 CGContextRef LocalCurrentGraphicsContext::cgContext() {
   // This synchronizes the CGContext to reflect the current SkCanvas state.
   // The implementation may not return the same CGContext each time.
-  CGContextRef cgContext = m_skiaBitLocker.cgContext();
+  CGContextRef cgContext = m_graphicsContextCanvas.cgContext();
 
   return cgContext;
 }