Plumb PaintImage to the PictureImageLayer.

cc/layers/picture_image_layer.h

Index: cc/layers/picture_image_layer.h
diff --git a/cc/layers/picture_image_layer.h b/cc/layers/picture_image_layer.h
index d07e6cae731408af67f8147177d5f1e27691b1da..faa62f41e8e06970b4065c8ea850126504aa5ba6 100644
--- a/cc/layers/picture_image_layer.h
+++ b/cc/layers/picture_image_layer.h
@@ -11,18 +11,17 @@
 #include "cc/cc_export.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
+#include "cc/paint/paint_image.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/size.h"
 
-class SkImage;
-
 namespace cc {
 
 class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient {
  public:
   static scoped_refptr<PictureImageLayer> Create();
 
-  void SetImage(sk_sp<const SkImage> image);
+  void SetImage(PaintImage image);
 
   // Layer implementation.
   std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
@@ -42,7 +41,7 @@ class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient {
   PictureImageLayer();
   ~PictureImageLayer() override;
 
-  sk_sp<const SkImage> image_;
+  PaintImage image_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureImageLayer);
 };