[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/display_item_list.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_DISPLAY_ITEM_LIST_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 36 matching lines @@
   // (crbug.com/548434).
   static scoped_refptr<DisplayItemList> CreateFromProto(
       const proto::DisplayItemList& proto,
       ClientPictureCache* client_picture_cache,
       std::vector<uint32_t>* used_engine_picture_ids);
 
   // Creates a Protobuf representing the state of this DisplayItemList.
   void ToProtobuf(proto::DisplayItemList* proto);
 
   // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
-  void Raster(SkCanvas* canvas,
+  void Raster(CdlCanvas* canvas,
               SkPicture::AbortCallback* callback,
               const gfx::Rect& canvas_target_playback_rect,
               float contents_scale) const;
 
-  void Raster(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
-
+  void Raster(CdlCanvas* canvas, SkPicture::AbortCallback* callback) const;
 
   // Because processing happens in these CreateAndAppend functions, all the set
   // up for the item should be done via the args, which is why the return type
   // needs to be const, to prevent set-after-processing mistakes.
 
   // Most paired begin item types default to an empty visual rect, which will
   // subsequently be grown as needed to encompass any contained items that draw
   // content, such as drawing or filter items.
   template <typename DisplayItemType, typename... Args>
   const DisplayItemType& CreateAndAppendPairedBeginItem(Args&&... args) {
@@ skipping 160 matching lines @@
   Inputs inputs_;
 
   friend class base::RefCountedThreadSafe<DisplayItemList>;
   FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
   DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_