cc/skia: Move gather images code to cc::DiscardableImageMap.

I'd like to change the way we gather images. Right now, we use a static
function that takes a picture as input and produces a list of images as
output. Instead, I'd like to integrate this closer to DiscardableImageMap
so that we can easily extend the gather to work with individual display
items.

This patch is the first step, which is to move the code to discardable
image map from skia/ext.

R=enne, reed@google.com
BUG=532662
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1353193002

Cr-Commit-Position: refs/heads/master@{#350918}

1 files changed, 4 insertions, 4 deletions

diff --git a/cc/playback/display_list_raster_source_unittest.cc b/cc/playback/display_list_raster_source_unittest.cc
index ef3af71..9322a76 100644
--- a/cc/playback/display_list_raster_source_unittest.cc
+++ b/cc/playback/display_list_raster_source_unittest.cc
@@ -201,7 +201,7 @@ TEST(DisplayListRasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
 
   // Tile sized iterators. These should find only one pixel ref.
   {
-    std::vector<skia::PositionImage> images;
+    std::vector<PositionImage> images;
     raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), &images);
     EXPECT_EQ(1u, images.size());
     EXPECT_EQ(discardable_image[0][0].get(), images[0].image);
@@ -210,7 +210,7 @@ TEST(DisplayListRasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
   }
   // Shifted tile sized iterators. These should find only one pixel ref.
   {
-    std::vector<skia::PositionImage> images;
+    std::vector<PositionImage> images;
     raster->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256), &images);
     EXPECT_EQ(1u, images.size());
     EXPECT_EQ(discardable_image[1][1].get(), images[0].image);
@@ -219,13 +219,13 @@ TEST(DisplayListRasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
   }
   // Ensure there's no discardable pixel refs in the empty cell
   {
-    std::vector<skia::PositionImage> images;
+    std::vector<PositionImage> images;
     raster->GetDiscardableImagesInRect(gfx::Rect(0, 256, 256, 256), &images);
     EXPECT_EQ(0u, images.size());
   }
   // Layer sized iterators. These should find three pixel ref.
   {
-    std::vector<skia::PositionImage> images;
+    std::vector<PositionImage> images;
     raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512), &images);
     EXPECT_EQ(3u, images.size());
     EXPECT_EQ(discardable_image[0][0].get(), images[0].image);