Rename paint data structures

cc/playback/image_hijack_canvas.h

 // Copyright 2016 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.
 
 #ifndef CC_PLAYBACK_IMAGE_HIJACK_CANVAS_H_
 #define CC_PLAYBACK_IMAGE_HIJACK_CANVAS_H_
 
 #include "base/macros.h"
 #include "cc/base/cc_export.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/SkNWayCanvas.h"
 
 namespace cc {
 
 class ImageDecodeCache;
 
-class CC_EXPORT ImageHijackCanvas : public SkNWayCanvas {
+class CC_EXPORT ImageHijackCanvas : public PaintCanvasPassThrough {
  public:
   ImageHijackCanvas(int width,
                     int height,
                     ImageDecodeCache* image_decode_cache);
 
  private:
   // Ensure that pictures are unpacked by this canvas, instead of being
   // forwarded to the raster canvas.
-  void onDrawPicture(const SkPicture* picture,
+  void onDrawPicture(const PaintRecord* picture,
                      const SkMatrix* matrix,
-                     const SkPaint* paint) override;
+                     const PaintFlags* paint) override;
   void onDrawImage(const SkImage* image,
                    SkScalar x,
                    SkScalar y,
-                   const SkPaint* paint) override;
+                   const PaintFlags* paint) override;
   void onDrawImageRect(const SkImage* image,
                        const SkRect* src,
                        const SkRect& dst,
-                       const SkPaint* paint,
+                       const PaintFlags* paint,
                        SrcRectConstraint constraint) override;
-  void onDrawRect(const SkRect&, const SkPaint&) override;
-  void onDrawPath(const SkPath& path, const SkPaint& paint) override;
-  void onDrawOval(const SkRect& r, const SkPaint& paint) override;
+  void onDrawRect(const SkRect&, const PaintFlags&) override;
+  void onDrawPath(const SkPath& path, const PaintFlags& paint) override;
+  void onDrawOval(const SkRect& r, const PaintFlags& paint) override;
   void onDrawArc(const SkRect& r,
                  SkScalar start_angle,
                  SkScalar sweep_angle,
                  bool use_center,
-                 const SkPaint& paint) override;
-  void onDrawRRect(const SkRRect& rr, const SkPaint& paint) override;
+                 const PaintFlags& paint) override;
+  void onDrawRRect(const SkRRect& rr, const PaintFlags& paint) override;
   void onDrawImageNine(const SkImage* image,
                        const SkIRect& center,
                        const SkRect& dst,
-                       const SkPaint* paint) override;
+                       const PaintFlags* paint) override;
 
   ImageDecodeCache* image_decode_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageHijackCanvas);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_IMAGE_HIJACK_CANVAS_H_