Rename paint data structures

cc/playback/skip_image_canvas.cc

Index: cc/playback/skip_image_canvas.cc
diff --git a/cc/playback/skip_image_canvas.cc b/cc/playback/skip_image_canvas.cc
index 27926be145b794e04a98c015dbb0d32ceda598a4..dd52cca7d9ce4688158b3fc5970deaa03fb6bfa3 100644
--- a/cc/playback/skip_image_canvas.cc
+++ b/cc/playback/skip_image_canvas.cc
@@ -8,10 +8,10 @@
 
 namespace cc {
 
-SkipImageCanvas::SkipImageCanvas(SkCanvas* canvas)
+SkipImageCanvas::SkipImageCanvas(PaintCanvas* canvas)
     : SkPaintFilterCanvas(canvas) {}
 
-bool SkipImageCanvas::onFilter(SkTCopyOnFirstWrite<SkPaint>* paint,
+bool SkipImageCanvas::onFilter(SkTCopyOnFirstWrite<PaintFlags>* paint,
                                Type type) const {
   if (type == kBitmap_Type)
     return false;
@@ -20,14 +20,14 @@ bool SkipImageCanvas::onFilter(SkTCopyOnFirstWrite<SkPaint>* paint,
   return !shader || !shader->isAImage();
 }
 
-void SkipImageCanvas::onDrawPicture(const SkPicture* picture,
+void SkipImageCanvas::onDrawPicture(const PaintRecord* picture,
                                     const SkMatrix* matrix,
-                                    const SkPaint* paint) {
-  SkTCopyOnFirstWrite<SkPaint> filteredPaint(paint);
+                                    const PaintFlags* paint) {
+  SkTCopyOnFirstWrite<PaintFlags> filteredPaint(paint);
 
   // To filter nested draws, we must unfurl pictures at this stage.
   if (onFilter(&filteredPaint, kPicture_Type))
-    SkCanvas::onDrawPicture(picture, matrix, filteredPaint);
+    PaintCanvas::onDrawPicture(picture, matrix, filteredPaint);
 }
 
 }  // namespace cc