Rename paint data structures

cc/playback/skip_image_canvas.h

Index: cc/playback/skip_image_canvas.h
diff --git a/cc/playback/skip_image_canvas.h b/cc/playback/skip_image_canvas.h
index 67206b7cb91991b73225ef89506c5aeca187b9bb..b89cb81d1f008d539b050d6a0dfdae1082820144 100644
--- a/cc/playback/skip_image_canvas.h
+++ b/cc/playback/skip_image_canvas.h
@@ -5,20 +5,25 @@
 #ifndef CC_PLAYBACK_SKIP_IMAGE_CANVAS_H_
 #define CC_PLAYBACK_SKIP_IMAGE_CANVAS_H_
 
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
+#include "cc/paint/paint_record.h"
+
 #include "third_party/skia/include/utils/SkPaintFilterCanvas.h"
 
 namespace cc {
 
 class SkipImageCanvas : public SkPaintFilterCanvas {
  public:
-  explicit SkipImageCanvas(SkCanvas* canvas);
+  explicit SkipImageCanvas(PaintCanvas* canvas);

[danakj, 2017/01/20 23:34:13]

do these make sense cuz it's inheriting from a SkCanvas?

[enne (OOO), 2017/01/24 01:51:27]

I had a thought of how I could make this work in the future, but I'll revert
this for now and maybe it'll make more sense in the future.

 
  private:
-  bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type type) const override;
+  bool onFilter(SkTCopyOnFirstWrite<PaintFlags>* paint,
+                Type type) const override;
 
-  void onDrawPicture(const SkPicture* picture,
+  void onDrawPicture(const PaintRecord* picture,
                      const SkMatrix* matrix,
-                     const SkPaint* paint) override;
+                     const PaintFlags* paint) override;
 };
 
 }  // namespace cc