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

cc/playback/picture_pile_impl_unittest.cc

 // Copyright 2013 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 "base/memory/scoped_ptr.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
@@ skipping 175 matching lines @@
   recording_source->Rerecord();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   // Tile sized iterators. These should find only one pixel ref.
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 0, 256, 256), 1.0, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 0, 512, 512), 2.0, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 0, 128, 128), 0.5, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   // Shifted tile sized iterators. These should find only one pixel ref.
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(260, 260, 256, 256), 1.0, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 260, 32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(520, 520, 512, 512), 2.0, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 260, 32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(130, 130, 128, 128), 0.5, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 260, 32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   // Ensure there's no discardable pixel refs in the empty cell
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 256, 256, 256), 1.0, pile.get());
     EXPECT_FALSE(iterator);
   }
   // Layer sized iterators. These should find three pixel ref.
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 0, 512, 512), 1.0, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(32, 32).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 0, 32, 32).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 260, 32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 0, 1024, 1024), 2.0, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(32, 32).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 0, 32, 32).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString(),
+              gfx::RectF(260, 260, 32, 32).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     PicturePileImpl::PixelRefIterator iterator(
         gfx::Rect(0, 0, 256, 256), 0.5, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 0, 32, 32).ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_FALSE(++iterator);
   }
 
-  // Copy test.
-  PicturePileImpl::PixelRefIterator iterator(
-      gfx::Rect(0, 0, 512, 512), 1.0, pile.get());
-  EXPECT_TRUE(iterator);
-  EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
-  EXPECT_TRUE(++iterator);
-  EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+  {
+    // Copy test.
+    PicturePileImpl::PixelRefIterator iterator(gfx::Rect(0, 0, 512, 512), 1.0,
+                                               pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][0].pixelRef());
+    EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 0, 32, 32).ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
 
-  // copy now points to the same spot as iterator,
-  // but both can be incremented independently.
-  PicturePileImpl::PixelRefIterator copy = iterator;
-  EXPECT_TRUE(++iterator);
-  EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
-  EXPECT_FALSE(++iterator);
+    // copy now points to the same spot as iterator,
+    // but both can be incremented independently.
+    PicturePileImpl::PixelRefIterator copy = iterator;
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
+    EXPECT_FALSE(++iterator);
 
-  EXPECT_TRUE(copy);
-  EXPECT_TRUE(*copy == discardable_bitmap[0][1].pixelRef());
-  EXPECT_TRUE(++copy);
-  EXPECT_TRUE(*copy == discardable_bitmap[1][1].pixelRef());
-  EXPECT_FALSE(++copy);
+    EXPECT_TRUE(copy);
+    EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[0][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 0, 32, 32).ToString(),
+              gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
+    EXPECT_TRUE(++copy);
+    EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[1][1].pixelRef());
+    EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+              gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
+    EXPECT_FALSE(++copy);
+  }
 }
 
 TEST(PicturePileImplTest, RasterFullContents) {
   gfx::Size tile_size(1000, 1000);
   gfx::Size layer_bounds(3, 5);
   float contents_scale = 1.5f;
   float raster_divisions = 2.f;
 
   scoped_ptr<FakePicturePile> recording_source =
       FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
@@ skipping 167 matching lines @@
       FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
   recording_source->SetMinContentsScale(0.5f);
 
   // Bitmaps 0-2 are exactly on tiles 0-2, so that they overlap the borders
   // of adjacent tiles.
   gfx::Rect bitmap_rects[] = {
       recording_source->tiling().TileBounds(0, 0),
       recording_source->tiling().TileBounds(1, 0),
       recording_source->tiling().TileBounds(2, 0),
   };
+  gfx::RectF expected_rects[] = {
+      gfx::RectF(recording_source->tiling().TileBounds(0, 0)),
+      gfx::RectF(recording_source->tiling().TileBounds(1, 0)),
+      gfx::RectF(recording_source->tiling().TileBounds(2, 0)),
+  };
   SkBitmap discardable_bitmap[arraysize(bitmap_rects)];
 
   for (size_t i = 0; i < arraysize(bitmap_rects); ++i) {
     CreateBitmap(bitmap_rects[i].size(), "discardable", &discardable_bitmap[i]);
     recording_source->add_draw_bitmap(discardable_bitmap[i],
                                       bitmap_rects[i].origin());
   }
 
   recording_source->SetGatherPixelRefs(true);
   recording_source->Rerecord();
@@ skipping 16 matching lines @@
       bitmap_rects[2].Intersects(pile->tiling().TileBoundsWithBorder(1, 0)));
   EXPECT_FALSE(bitmap_rects[2].Intersects(pile->tiling().TileBounds(1, 0)));
 
   // Tile-sized iterators.
   {
     // Because tile 0's borders extend onto tile 1, it will include both
     // bitmap 0 and 1.  However, it should *not* include bitmap 2.
     PicturePileImpl::PixelRefIterator iterator(
         pile->tiling().TileBounds(0, 0), 1.f, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0].pixelRef());
+    EXPECT_EQ(expected_rects[0].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1].pixelRef());
+    EXPECT_EQ(expected_rects[1].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     // Tile 1 + borders hits all bitmaps.
     PicturePileImpl::PixelRefIterator iterator(
         pile->tiling().TileBounds(1, 0), 1.f, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[0].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[0].pixelRef());
+    EXPECT_EQ(expected_rects[0].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1].pixelRef());
+    EXPECT_EQ(expected_rects[1].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[2].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2].pixelRef());
+    EXPECT_EQ(expected_rects[2].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_FALSE(++iterator);
   }
   {
     // Tile 2 should not include bitmap 0, which is only on tile 0 and the
     // borders of tile 1.
     PicturePileImpl::PixelRefIterator iterator(
         pile->tiling().TileBounds(2, 0), 1.f, pile.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[1].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1].pixelRef());
+    EXPECT_EQ(expected_rects[1].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[2].pixelRef());
+    EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2].pixelRef());
+    EXPECT_EQ(expected_rects[2].ToString(),
+              gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_FALSE(++iterator);
   }
 }
 
 }  // namespace
 }  // namespace cc