Rename paint data structures

ui/gfx/canvas_paint_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/mac/mac_util.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 #include "ui/gfx/canvas_paint_mac.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 
 CanvasSkiaPaint::CanvasSkiaPaint(NSRect dirtyRect)
     : rectangle_(dirtyRect),
       composite_alpha_(false) {
   Init(true);
 }
 
 CanvasSkiaPaint::CanvasSkiaPaint(NSRect dirtyRect, bool opaque)
     : rectangle_(dirtyRect),
       composite_alpha_(false) {
   Init(opaque);
 }
 
 CanvasSkiaPaint::~CanvasSkiaPaint() {
   if (!is_empty()) {
-    SkCanvas* canvas = sk_canvas();
+    cc::PaintCanvas* canvas = sk_canvas();
     canvas->restoreToCount(1);
 
     // Blit the dirty rect to the current context.
     SkPixmap pixmap;
     bool success = canvas->peekPixels(&pixmap);
     DCHECK(success);
     SkBitmap bitmap;
     success = bitmap.installPixels(pixmap);
     DCHECK(success);
     CGImageRef image = SkCreateCGImageRefWithColorspace(
@@ skipping 23 matching lines @@
 
 void CanvasSkiaPaint::Init(bool opaque) {
   CGContextRef destination_context =
         (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
   CGRect scaled_unit_rect = CGContextConvertRectToDeviceSpace(
         destination_context, CGRectMake(0, 0, 1, 1));
     // Assume that the x scale and the y scale are the same.
   CGFloat scale = scaled_unit_rect.size.width;
 
   gfx::Size size(NSWidth(rectangle_), NSHeight(rectangle_));
   RecreateBackingCanvas(size, scale, opaque);

[danakj, 2017/01/25 19:10:07]

This is going to have to make a passthru PaintCanvas to a bitmap canvas, and
store the SkCanvas or SkBitmap here, for the destructor to use instead of it
pulling it out of sk_canvas().

[enne (OOO), 2017/01/25 21:07:16]

Why is that? gfx::Canvas creates a PaintSurface which gets a PaintCanvas off of
it and then this function will call some commands on the PaintCanvas.  This all
seems pretty straightforward to me.

[danakj, 2017/01/25 22:11:41]

Cuz the destructor does peekPixels on the canvas. I think it needs an SkCanvas
behind it.

[danakj, 2017/01/25 22:12:28]

Or more precisely, I don't think PaintCanvas should even have peekPixels so it
will need an SkCanvas* inside this class that it can call that on.

-  SkCanvas* canvas = sk_canvas();
+  cc::PaintCanvas* canvas = sk_canvas();
   canvas->clear(SkColorSetARGB(0, 0, 0, 0));
 
     // Need to translate so that the dirty region appears at the origin of the
     // surface.
   canvas->translate(-SkDoubleToScalar(NSMinX(rectangle_)),
                     -SkDoubleToScalar(NSMinY(rectangle_)));
 }
 
 }  // namespace skia