[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/raster_source.h

 // Copyright 2014 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_RASTER_SOURCE_H_
 #define CC_PLAYBACK_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #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 {
 class ColorSpace;
 }
 
 namespace cc {
 class DisplayItemList;
 class DrawImage;
 class ImageDecodeCache;
@@ skipping 83 matching lines @@
   // during rasterization.
   virtual void SetShouldAttemptToUseDistanceFieldText();
 
   // Return true iff this raster source would benefit from using distance
   // field text.
   virtual bool ShouldAttemptToUseDistanceFieldText() const;
 
   // 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.
   virtual bool CanUseLCDText() const;
 
   scoped_refptr<RasterSource> CreateCloneWithoutLCDText() const;
 
   // Image decode controller should be set once. Its lifetime has to exceed that
   // of the raster source, since the raster source will access it during raster.
   void set_image_decode_cache(ImageDecodeCache* image_decode_cache) {
@@ skipping 23 matching lines @@
   const int slow_down_raster_scale_factor_for_debug_;
   // TODO(enne/vmiura): this has a read/write race between raster and compositor
   // threads with multi-threaded Ganesh.  Make this const or remove it.
   bool should_attempt_to_use_distance_field_text_;
 
   // In practice, this is only set once before raster begins, so it's ok with
   // respect to threading.
   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);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_