[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/raster_source.h

Index: cc/playback/raster_source.h
diff --git a/cc/playback/raster_source.h b/cc/playback/raster_source.h
index c158094308f842ac7180334220d0883b6bcba2fe..f4c32b2623d765e776fe9709b9f2d0f6b6ab85e7 100644
--- a/cc/playback/raster_source.h
+++ b/cc/playback/raster_source.h
@@ -15,6 +15,8 @@
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/playback/recording_source.h"
 #include "skia/ext/analysis_canvas.h"
+#include "skia/ext/cdl_picture.h"
+#include "skia/ext/cdl_canvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace gfx {
@@ -118,7 +120,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   // Tracing functionality.
   virtual void DidBeginTracing();
   virtual void AsValueInto(base::trace_event::TracedValue* array) const;
-  virtual sk_sp<SkPicture> GetFlattenedPicture();
+  virtual sk_sp<CdlPicture> GetFlattenedPicture();
   virtual size_t GetPictureMemoryUsage() const;
 
   // Return true if LCD anti-aliasing may be used when rastering text.
@@ -162,9 +164,10 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   ImageDecodeCache* image_decode_cache_;
 
  private:
-  void RasterCommon(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
+  void RasterCommon(CdlCanvas* canvas,
+                    SkPicture::AbortCallback* callback) const;
 
-  void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
+  void PrepareForPlaybackToCanvas(CdlCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };