cc: Add color space to image decode caches

cc/raster/raster_source.h

Index: cc/raster/raster_source.h
diff --git a/cc/raster/raster_source.h b/cc/raster/raster_source.h
index ff9d0f24938893c72b5ef458db86cff9cd1961c7..e1b6d9cc6db542d90d2da0adc7cc802728cdfe4a 100644
--- a/cc/raster/raster_source.h
+++ b/cc/raster/raster_source.h
@@ -56,7 +56,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
 
   // TODO(trchen): Deprecated.
   void PlaybackToCanvas(SkCanvas* canvas,
-                        const gfx::ColorSpace& canvas_color_space,
+                        const gfx::ColorSpace& target_color_space,
                         const gfx::Rect& canvas_bitmap_rect,
                         const gfx::Rect& canvas_playback_rect,
                         float contents_scale,
@@ -72,7 +72,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   // Note that this should only be called after the image decode controller has
   // been set, which happens during commit.
   virtual void PlaybackToCanvas(SkCanvas* canvas,
-                                const gfx::ColorSpace& canvas_color_space,
+                                const gfx::ColorSpace& target_color_space,
                                 const PlaybackSettings& settings) const;
 
   // Returns whether the given rect at given scale is of solid color in
@@ -96,6 +96,7 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   // they were being using during raster at scale |raster_scale|.
   void GetDiscardableImagesInRect(const gfx::Rect& layer_rect,
                                   float contents_scale,
+                                  const gfx::ColorSpace& target_color_space,
                                   std::vector<DrawImage>* images) const;
 
   // Return true iff this raster source can raster the given rect in layer
@@ -155,7 +156,6 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
 
  private:
   void RasterCommon(SkCanvas* canvas,
-                    const gfx::ColorSpace& canvas_color_space,
                     SkPicture::AbortCallback* callback) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;