Refactor SoftwareImageDecodeController

cc/tiles/software_image_decode_controller.h

Index: cc/tiles/software_image_decode_controller.h
diff --git a/cc/tiles/software_image_decode_controller.h b/cc/tiles/software_image_decode_controller.h
index 54d655e690a2004bf081ac599c881d1da6b7d006..c8ac76cd9d1d3637de966d1bd529c7e212157177 100644
--- a/cc/tiles/software_image_decode_controller.h
+++ b/cc/tiles/software_image_decode_controller.h
@@ -74,7 +74,7 @@ class CC_EXPORT ImageDecodeControllerKey {
                            const gfx::Rect& src_rect,
                            const gfx::Size& size,
                            SkFilterQuality filter_quality,
-                           bool can_use_original_decode);
+                           bool can_use_original_decode_);

[ericrk, 2016/03/29 23:23:10]

nit: remove the "_"

[cblume, 2016/03/31 18:28:53]

Done.

 
   uint32_t image_id_;
   gfx::Rect src_rect_;
@@ -185,6 +185,31 @@ class CC_EXPORT SoftwareImageDecodeController : public ImageDecodeController {
   DecodedDrawImage GetDecodedImageForDrawInternal(const ImageKey& key,
                                                   const DrawImage& draw_image);
 
+  struct DecodedImageResult {
+    DecodedImageResult(SkPixmap decoded_pixmap,
+                       DrawImage original_size_draw_image,
+                       DecodedDrawImage decoded_draw_image);
+
+    SkPixmap decoded_pixmap_;
+    DrawImage original_size_draw_image_;
+    DecodedDrawImage decoded_draw_image_;
+  };
+
+  scoped_ptr<DecodedImage> DecodeImageMediumQuality(const ImageKey& key,
+                                                    const SkImage& image);
+  scoped_ptr<DecodedImage> DecodeImageHighQuality(const ImageKey& key,
+                                                  const SkImage& image);
+
+  scoped_ptr<DecodedImage> GetOriginalImageDecode(const ImageKey& key,
+                                                  const SkImage& image);
+
+  DecodedImageResult DecodeImageOrUseCache(const ImageKey& key,
+                                           const SkImage& image);
+
+  scoped_ptr<DecodedImage> ScaleImage(
+      const ImageKey& key,
+      const DecodedImageResult& decoded_image_result);
+
   void SanityCheckState(int line, bool lock_acquired);
   void RefImage(const ImageKey& key);
   void RefAtRasterImage(const ImageKey& key);