[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/layers/picture_layer.h

 // Copyright 2012 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_LAYERS_PICTURE_LAYER_H_
 #define CC_LAYERS_PICTURE_LAYER_H_
 
 #include "base/macros.h"
 #include "cc/base/invalidation_region.h"
 #include "cc/debug/devtools_instrumentation.h"
@@ skipping 17 matching lines @@
     return picture_layer_inputs_.nearest_neighbor;
   }
 
   // Layer interface.
   std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
   void SetLayerTreeHost(LayerTreeHost* host) override;
   void PushPropertiesTo(LayerImpl* layer) override;
   void SetNeedsDisplayRect(const gfx::Rect& layer_rect) override;
   bool Update() override;
   void SetIsMask(bool is_mask) override;
-  sk_sp<SkPicture> GetPicture() const override;
+  sk_sp<CdlPicture> GetPicture() const override;
 
   void SetTypeForProtoSerialization(proto::LayerNode* proto) const override;
   void ToLayerPropertiesProto(proto::LayerProperties* proto) override;
 
   bool IsSuitableForGpuRasterization() const override;
 
   void RunMicroBenchmark(MicroBenchmark* benchmark) override;
 
   ContentLayerClient* client() { return picture_layer_inputs_.client; }
 
@@ skipping 41 matching lines @@
 
   int update_source_frame_number_;
   bool is_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_LAYER_H_