cc: Add color space to image decode caches

cc/paint/discardable_image_map_unittest.cc

 // Copyright 2015 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.
 
 #include "cc/paint/discardable_image_map.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 25 matching lines @@
 };
 
 }  // namespace
 
 class DiscardableImageMapTest : public testing::Test {
  public:
   std::vector<PositionScaleDrawImage> GetDiscardableImagesInRect(
       const DiscardableImageMap& image_map,
       const gfx::Rect& rect) {
     std::vector<DrawImage> draw_images;
-    image_map.GetDiscardableImagesInRect(rect, 1.f, &draw_images);
+    gfx::ColorSpace target_color_space = gfx::ColorSpace::CreateXYZD50();

[vmpstr, 2017/04/04 01:16:43]

Ah yes, the elusive XYZD50 color space. We meet again.

[ccameron, 2017/04/04 06:41:10]

Added a comment about the choice ... it's a "not nothing and not sRGB value...".

+    image_map.GetDiscardableImagesInRect(rect, 1.f, target_color_space,
+                                         &draw_images);
 
     std::vector<size_t> indices;
     image_map.images_rtree_.Search(rect, &indices);
     std::vector<PositionScaleDrawImage> position_draw_images;
     for (size_t index : indices) {
       position_draw_images.push_back(
           PositionScaleDrawImage(image_map.all_images_[index].first.image(),
                                  image_map.all_images_[index].second,
                                  image_map.all_images_[index].first.scale()));
     }
 
     EXPECT_EQ(draw_images.size(), position_draw_images.size());
-    for (size_t i = 0; i < draw_images.size(); ++i)
+    for (size_t i = 0; i < draw_images.size(); ++i) {
       EXPECT_TRUE(draw_images[i].image() == position_draw_images[i].image);
+      EXPECT_EQ(draw_images[i].target_color_space(), target_color_space);
+    }
     return position_draw_images;
   }
 
   // Note that the image rtree outsets the images by 1, see the comment in
   // DiscardableImagesMetadataCanvas::AddImage.
   std::vector<gfx::Rect> InsetImageRects(
       const std::vector<PositionScaleDrawImage>& images) {
     std::vector<gfx::Rect> result;
     for (auto& image : images) {
       result.push_back(image.image_rect);
@@ skipping 566 matching lines @@
   EXPECT_EQ(gfx::Rect(2 * 512 + 6, 512 + 6, 500, 500), inset_rects[0]);
   EXPECT_TRUE(images[1].image == discardable_image[2][1]);
   EXPECT_EQ(gfx::Rect(512 + 6, 2 * 512 + 6, 500, 500), inset_rects[1]);
   EXPECT_TRUE(images[2].image == discardable_image[2][3]);
   EXPECT_EQ(gfx::Rect(3 * 512 + 6, 2 * 512 + 6, 500, 500), inset_rects[2]);
   EXPECT_TRUE(images[3].image == discardable_image[3][2]);
   EXPECT_EQ(gfx::Rect(2 * 512 + 6, 3 * 512 + 6, 500, 500), inset_rects[3]);
 }
 
 }  // namespace cc