cc: Plumb more details about pixel refs to tile manager.

cc/playback/recording_source_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 <vector>
 
 #include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/fake_picture_pile.h"
 #include "cc/test/fake_picture_pile_impl.h"
@@ skipping 62 matching lines @@
       CreateRecordingSource<TypeParam>(recorded_viewport, grid_cell_size);
   recording_source->SetGatherPixelRefs(false);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       CreateRasterSource<TypeParam>(recording_source.get());
 
   // If recording source do not gather pixel ref, raster source is not going to
   // get pixel refs.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(recorded_viewport, 1.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
 }
 
 TYPED_TEST(RecordingSourceTest, EmptyPixelRefs) {
   gfx::Size grid_cell_size(128, 128);
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   scoped_ptr<TypeParam> recording_source =
       CreateRecordingSource<TypeParam>(recorded_viewport, grid_cell_size);
   recording_source->SetGatherPixelRefs(true);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       CreateRasterSource<TypeParam>(recording_source.get());
 
   // Tile sized iterators.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 1.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 2.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 64, 64), 0.5, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   // Shifted tile sized iterators.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(140, 140, 128, 128), 1.0,
                                    &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(280, 280, 256, 256), 2.0,
                                    &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(70, 70, 64, 64), 0.5, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   // Layer sized iterators.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 1.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 2.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 0.5, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
 }
 
 TYPED_TEST(RecordingSourceTest, NoDiscardablePixelRefs) {
   gfx::Size grid_cell_size(128, 128);
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   scoped_ptr<TypeParam> recording_source =
@@ skipping 18 matching lines @@
   recording_source->add_draw_bitmap(non_discardable_bitmap,
                                     gfx::Point(150, 150));
   recording_source->SetGatherPixelRefs(true);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       CreateRasterSource<TypeParam>(recording_source.get());
 
   // Tile sized iterators.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 1.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 2.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 64, 64), 0.5, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   // Shifted tile sized iterators.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(140, 140, 128, 128), 1.0,
                                    &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(280, 280, 256, 256), 2.0,
                                    &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(70, 70, 64, 64), 0.5, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   // Layer sized iterators.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 1.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 2.0, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 0.5, &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
 }
 
 TYPED_TEST(RecordingSourceTest, DiscardablePixelRefs) {
   gfx::Size grid_cell_size(128, 128);
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   scoped_ptr<TypeParam> recording_source =
@@ skipping 16 matching lines @@
   recording_source->add_draw_bitmap(discardable_bitmap[1][1],
                                     gfx::Point(140, 140));
   recording_source->SetGatherPixelRefs(true);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       CreateRasterSource<TypeParam>(recording_source.get());
 
   // Tile sized iterators. These should find only one pixel ref.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 1.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 2.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 64, 64), 0.5, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
 
   // Shifted tile sized iterators. These should find only one pixel ref.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(140, 140, 128, 128), 1.0,
                                    &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(140, 140, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(280, 280, 256, 256), 2.0,
                                    &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(140, 140, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(70, 70, 64, 64), 0.5, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(140, 140, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
 
   // Ensure there's no discardable pixel refs in the empty cell
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(140, 0, 128, 128), 1.0,
                                    &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
 
   // Layer sized iterators. These should find all 3 pixel refs.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 1.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[1] == discardable_bitmap[1][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[2] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(3u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[1].pixel_ref == discardable_bitmap[1][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[2].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(0, 130, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(140, 140, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 2.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[1] == discardable_bitmap[1][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[2] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(3u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[1].pixel_ref == discardable_bitmap[1][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[2].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(0, 130, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(140, 140, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 0.5, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[1] == discardable_bitmap[1][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[2] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(3u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[1].pixel_ref == discardable_bitmap[1][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[2].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(0, 130, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(140, 140, 32, 32).ToString(),
+              gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
 }
 
 TYPED_TEST(RecordingSourceTest, DiscardablePixelRefsBaseNonDiscardable) {
   gfx::Size grid_cell_size(256, 256);
   gfx::Rect recorded_viewport(0, 0, 512, 512);
 
   scoped_ptr<TypeParam> recording_source =
       CreateRecordingSource<TypeParam>(recorded_viewport, grid_cell_size);
 
@@ skipping 19 matching lines @@
   recording_source->add_draw_bitmap(discardable_bitmap[1][1],
                                     gfx::Point(260, 260));
   recording_source->SetGatherPixelRefs(true);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       CreateRasterSource<TypeParam>(recording_source.get());
 
   // Tile sized iterators. These should find only one pixel ref.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 1.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 2.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 0.5, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   // Shifted tile sized iterators. These should find only one pixel ref.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(260, 260, 256, 256), 1.0,
                                    &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(520, 520, 512, 512), 2.0,
                                    &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(130, 130, 128, 128), 0.5,
                                    &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(1u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
   }
   // Ensure there's no discardable pixel refs in the empty cell
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 256, 256, 256), 1.0,
                                    &pixel_refs);
     EXPECT_TRUE(pixel_refs.empty());
   }
   // Layer sized iterators. These should find three pixel ref.
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 1.0, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[1] == discardable_bitmap[0][1].pixelRef());
-    EXPECT_TRUE(pixel_refs[2] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(3u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[1].pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(pixel_refs[2].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(260, 0, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 1024, 1024), 2.0,
                                    &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[1] == discardable_bitmap[0][1].pixelRef());
-    EXPECT_TRUE(pixel_refs[2] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(3u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[1].pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(pixel_refs[2].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(260, 0, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
   {
-    std::vector<SkPixelRef*> pixel_refs;
+    std::vector<skia::PositionPixelRef> pixel_refs;
     raster_source->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 0.5, &pixel_refs);
-    EXPECT_FALSE(pixel_refs.empty());
-    EXPECT_TRUE(pixel_refs[0] == discardable_bitmap[0][0].pixelRef());
-    EXPECT_TRUE(pixel_refs[1] == discardable_bitmap[0][1].pixelRef());
-    EXPECT_TRUE(pixel_refs[2] == discardable_bitmap[1][1].pixelRef());
     EXPECT_EQ(3u, pixel_refs.size());
+    EXPECT_TRUE(pixel_refs[0].pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(pixel_refs[1].pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(pixel_refs[2].pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(260, 0, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+    EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
+              gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
 }
 
 }  // namespace
 }  // namespace cc