[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/image_hijack_canvas.h

Index: cc/playback/image_hijack_canvas.h
diff --git a/cc/playback/image_hijack_canvas.h b/cc/playback/image_hijack_canvas.h
index 57c2e86c96da4d00212fd7453c1fb40619bd081f..5ea28709501f493ee627a907a080a3b2c9a0547c 100644
--- a/cc/playback/image_hijack_canvas.h
+++ b/cc/playback/image_hijack_canvas.h
@@ -6,38 +6,33 @@
 #define CC_PLAYBACK_IMAGE_HIJACK_CANVAS_H_
 
 #include "base/macros.h"
+#include "skia/ext/cdl_canvas.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
 namespace cc {
 
 class ImageDecodeCache;
 
-class ImageHijackCanvas : public SkNWayCanvas {
+class ImageHijackCanvas : public CdlPassThroughCanvas {
  public:
-  ImageHijackCanvas(int width,
-                    int height,
-                    ImageDecodeCache* image_decode_cache);
+  ImageHijackCanvas(SkCanvas* canvas, 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 CdlPicture* picture,
                      const SkMatrix* matrix,
-                     const SkPaint* paint) override;
+                     const CdlPaint* paint) override;
 
   void onDrawImage(const SkImage* image,
                    SkScalar x,
                    SkScalar y,
-                   const SkPaint* paint) override;
+                   const CdlPaint* paint) override;
   void onDrawImageRect(const SkImage* image,
                        const SkRect* src,
                        const SkRect& dst,
-                       const SkPaint* paint,
-                       SrcRectConstraint constraint) override;
-  void onDrawImageNine(const SkImage* image,
-                       const SkIRect& center,
-                       const SkRect& dst,
-                       const SkPaint* paint) override;
+                       const CdlPaint* paint,
+                       SkCanvas::SrcRectConstraint constraint) override;
 
   ImageDecodeCache* image_decode_cache_;