color: Enable color conversion in image decoder caches

cc/tiles/software_image_decode_cache.h

 // Copyright 2016 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_TILES_SOFTWARE_IMAGE_DECODE_CACHE_H_
 #define CC_TILES_SOFTWARE_IMAGE_DECODE_CACHE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 231 matching lines @@
   // Get the decoded draw image for the given key and draw_image. Note that this
   // function has to be called with no lock acquired, since it will acquire its
   // own locks and might call DecodeImageInternal above. Also note that this
   // function will use the provided key, even if
   // ImageKey::FromDrawImage(draw_image) would return a different key.
   // Note that when used internally, we still require that
   // DrawWithImageFinished() is called afterwards.
   DecodedDrawImage GetDecodedImageForDrawInternal(const ImageKey& key,
                                                   const DrawImage& draw_image);
 
-  // GetOriginalImageDecode is called by DecodeImageInternal when the quality
-  // does not scale the image. Like DecodeImageInternal, it should be called
-  // with no lock acquired and it returns nullptr if the decoding failed.
-  std::unique_ptr<DecodedImage> GetOriginalImageDecode(
+  // GetOriginalSizeImageDecode is called by DecodeImageInternal when the
+  // quality does not scale the image. Like DecodeImageInternal, it should be
+  // called with no lock acquired and it returns nullptr if the decoding failed.
+  std::unique_ptr<DecodedImage> GetOriginalSizeImageDecode(
+      const ImageKey& key,
       sk_sp<const SkImage> image);
 
-  // GetSubrectImageDecode is similar to GetOriginalImageDecode in that no scale
-  // is performed on the image. However, we extract a subrect (copy it out) and
-  // only return this subrect in order to cache a smaller amount of memory. Note
-  // that this uses GetOriginalImageDecode to get the initial 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).
+  // GetSubrectImageDecode is similar to GetOriginalSizeImageDecode in that no
+  // scale is performed on the image. However, we extract a subrect (copy it
+  // out) and only return this subrect in order to cache a smaller amount of
+  // memory. Note that this uses GetOriginalSizeImageDecode to get the initial
+  // 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);
 
   // 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,
@@ skipping 46 matching lines @@
   ResourceFormat format_;
   size_t max_items_in_cache_;
 
   // Used to uniquely identify DecodedImages for memory traces.
   base::AtomicSequenceNumber next_tracing_id_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TILES_SOFTWARE_IMAGE_DECODE_CACHE_H_