cc: Add color space to image decode caches

cc/raster/raster_source.h

 // Copyright 2014 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_RASTER_RASTER_SOURCE_H_
 #define CC_RASTER_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 50 matching lines @@
   // Helper function to apply a few common operations before passing the canvas
   // to the shorter version. This is useful for rastering into tiles.
   // canvas is expected to be backed by a tile, with a default state.
   // raster_transform will be applied to the display list, rastering the list
   // into the "content space".
   // canvas_bitmap_rect defines the extent of the tile in the content space,
   // i.e. contents in the rect will be cropped and translated onto the canvas.
   // canvas_playback_rect can be used to replay only part of the recording in,
   // the content space, so only a sub-rect of the tile gets rastered.
   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,
                         const gfx::AxisTransform2d& raster_transform,
                         const PlaybackSettings& settings) const;
 
   // Raster this RasterSource into the given canvas. Canvas states such as
   // CTM and clip region will be respected. This function will replace pixels
   // in the clip region without blending. It is assumed that existing pixels
   // may be uninitialized and will be cleared before playback.
   //
   // Virtual for testing.
   //
   // 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
   // this raster source, as well as the solid color value.
   bool PerformSolidColorAnalysis(const gfx::Rect& content_rect,
                                  float contents_scale,
                                  SkColor* color) const;
 
   // Returns true iff the whole raster source is of solid color.
   bool IsSolidColor() const;
 
   // Returns the color of the raster source if it is solid color. The results
   // are unspecified if IsSolidColor returns false.
   SkColor GetSolidColor() const;
 
   // Returns the size of this raster source.
   gfx::Size GetSize() const;
 
   // Populate the given list with all images that may overlap the given
   // rect in layer space. The returned draw images' matrices are modified as if
   // 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
   // space.
   bool CoversRect(const gfx::Rect& layer_rect) const;
 
   // Returns true if this raster source has anything to rasterize.
   virtual bool HasRecordings() const;
 
   // Valid rectangle in which everything is recorded and can be rastered from.
@@ skipping 39 matching lines @@
   const gfx::Size size_;
   const bool clear_canvas_with_debug_color_;
   const int slow_down_raster_scale_factor_for_debug_;
 
   // In practice, this is only set once before raster begins, so it's ok with
   // respect to threading.
   ImageDecodeCache* image_decode_cache_;
 
  private:
   void RasterCommon(SkCanvas* canvas,
-                    const gfx::ColorSpace& canvas_color_space,
                     SkPicture::AbortCallback* callback) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_RASTER_SOURCE_H_