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..74545e62e9fa6f8a6a955e3abede40831cd3df1c 100644
--- a/cc/tiles/software_image_decode_controller.h
+++ b/cc/tiles/software_image_decode_controller.h
@@ -185,6 +185,33 @@ 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> DecodeImageNoneLowQuality(const ImageKey& key,
+                                                     const SkImage& image);

[ericrk, 2016/03/24 16:06:59]

nit: This function is not defined or used.

[cblume, 2016/03/24 18:45:10]

Done.

+  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);