Convert SkiaBitLocker to use PaintCanvas

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 31 matching lines @@
 }
 
 static const int kMaxDirtyRectPixelSize = 10000;
 
 LocalCurrentGraphicsContext::LocalCurrentGraphicsContext(
     PaintCanvas* canvas,
     float deviceScaleFactor,
     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();
 
   // Constrain the maximum size of what we paint to something reasonable. This
   // accordingly means we will not paint the entirety of truly huge native form
   // elements, which is deemed an acceptable tradeoff for this simple approach
   // to manage such an edge case.
   if (dirtyRect.width() > kMaxDirtyRectPixelSize ||
       dirtyRect.height() > kMaxDirtyRectPixelSize)
     canvas->clipRect(clampRect(kMaxDirtyRectPixelSize, dirtyRect),
@@ skipping 17 matching lines @@
     [NSGraphicsContext setCurrentContext:m_savedNSGraphicsContext];
     [m_savedNSGraphicsContext release];
   }
 
   m_savedCanvas->restore();
 }
 
 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;
 }
 }