cc: Keep PaintImage in DrawImage.

cc/tiles/software_image_decode_cache.h

Index: cc/tiles/software_image_decode_cache.h
diff --git a/cc/tiles/software_image_decode_cache.h b/cc/tiles/software_image_decode_cache.h
index 04aeb452ed4ff0b4fb50e30b8be8b47574c65ead..4453dfaa6f38e4c8ff1f6071da36ea258eb04c3a 100644
--- a/cc/tiles/software_image_decode_cache.h
+++ b/cc/tiles/software_image_decode_cache.h
@@ -264,17 +264,15 @@ class CC_EXPORT SoftwareImageDecodeCache
   // data, which ensures that we cache an unlocked version of the original image
   // in case we need to extract multiple subrects (as would be the case in an
   // atlas).
-  std::unique_ptr<DecodedImage> GetSubrectImageDecode(
-      const ImageKey& key,
-      sk_sp<const SkImage> image);
+  std::unique_ptr<DecodedImage> GetSubrectImageDecode(const ImageKey& key,
+                                                      PaintImage image);

[vmpstr, 2017/05/16 17:43:27]

for functions that don't store the paint image, you should pass them by const
ref.

[Khushal, 2017/05/16 21:29:12]

Done.

 
   // GetScaledImageDecode is called by DecodeImageInternal when the quality
   // requires the image be scaled. Like DecodeImageInternal, it should be
   // called with no lock acquired and it returns nullptr if the decoding or
   // scaling failed.
-  std::unique_ptr<DecodedImage> GetScaledImageDecode(
-      const ImageKey& key,
-      sk_sp<const SkImage> image);
+  std::unique_ptr<DecodedImage> GetScaledImageDecode(const ImageKey& key,
+                                                     PaintImage image);
 
   void RefImage(const ImageKey& key);
   void RefAtRasterImage(const ImageKey& key);