[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/blimp/client_picture_cache.h

Index: cc/blimp/client_picture_cache.h
diff --git a/cc/blimp/client_picture_cache.h b/cc/blimp/client_picture_cache.h
index ddee6a32dde862056786bb847c4caadcba9e6282..1865eca6b131ee22b30c0f7777f31935f663256b 100644
--- a/cc/blimp/client_picture_cache.h
+++ b/cc/blimp/client_picture_cache.h
@@ -7,10 +7,9 @@
 
 #include <vector>
 
+#include "skia/ext/cdl_common.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
-class SkPicture;
-
 namespace cc {
 struct PictureData;
 
@@ -30,7 +29,7 @@ class ClientPictureCache {
   // Retrieves an SkPicture from the in-memory cache. It is required that the
   // provided ID is the same as the unique ID that is given through the cache
   // update.
-  virtual sk_sp<const SkPicture> GetPicture(uint32_t engine_picture_id) = 0;
+  virtual sk_sp<const CdlPicture> GetPicture(uint32_t engine_picture_id) = 0;
 
   // Called when a PictureCacheUpdate has been retrieved from the engine. This
   // must contain all the new SkPictures that are in use.