Revert of Implement DisplayList GatherPixelRefs

cc/resources/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 14 matching lines @@
   SkPaint solid_paint;
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
   solid_paint.setColor(solid_color);
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
   SkPaint non_solid_paint;
   non_solid_paint.setColor(non_solid_color);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 400, 400),
                                              solid_paint);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   // Ensure everything is solid.
   for (int y = 0; y <= 300; y += 100) {
     for (int x = 0; x <= 300; x += 100) {
       RasterSource::SolidColorAnalysis analysis;
       gfx::Rect rect(x, y, 100, 100);
       pile->PerformSolidColorAnalysis(rect, 1.0, &analysis);
       EXPECT_TRUE(analysis.is_solid_color) << rect.ToString();
       EXPECT_EQ(analysis.solid_color, solid_color) << rect.ToString();
     }
   }
 
   // Add one non-solid pixel and recreate the raster source.
   recording_source->add_draw_rect_with_paint(gfx::Rect(50, 50, 1, 1),
                                              non_solid_paint);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
   pile = FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   RasterSource::SolidColorAnalysis analysis;
   pile->PerformSolidColorAnalysis(gfx::Rect(0, 0, 100, 100), 1.0, &analysis);
   EXPECT_FALSE(analysis.is_solid_color);
 
   pile->PerformSolidColorAnalysis(gfx::Rect(100, 0, 100, 100), 1.0, &analysis);
   EXPECT_TRUE(analysis.is_solid_color);
   EXPECT_EQ(analysis.solid_color, solid_color);
 
@@ skipping 25 matching lines @@
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
   SkPaint solid_paint;
   solid_paint.setColor(solid_color);
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
   SkPaint non_solid_paint;
   non_solid_paint.setColor(non_solid_color);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 400, 400),
                                              solid_paint);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   // Ensure everything is solid.
   for (int y = 0; y <= 30; y += 10) {
     for (int x = 0; x <= 30; x += 10) {
       RasterSource::SolidColorAnalysis analysis;
       gfx::Rect rect(x, y, 10, 10);
       pile->PerformSolidColorAnalysis(rect, 0.1f, &analysis);
       EXPECT_TRUE(analysis.is_solid_color) << rect.ToString();
       EXPECT_EQ(analysis.solid_color, solid_color) << rect.ToString();
     }
   }
 
   // Add one non-solid pixel and recreate the raster source.
   recording_source->add_draw_rect_with_paint(gfx::Rect(50, 50, 1, 1),
                                              non_solid_paint);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
   pile = FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   RasterSource::SolidColorAnalysis analysis;
   pile->PerformSolidColorAnalysis(gfx::Rect(0, 0, 10, 10), 0.1f, &analysis);
   EXPECT_FALSE(analysis.is_solid_color);
 
   pile->PerformSolidColorAnalysis(gfx::Rect(10, 0, 10, 10), 0.1f, &analysis);
   EXPECT_TRUE(analysis.is_solid_color);
   EXPECT_EQ(analysis.solid_color, solid_color);
 
@@ skipping 22 matching lines @@
       FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
   RasterSource::SolidColorAnalysis analysis;
   EXPECT_FALSE(analysis.is_solid_color);
 
   pile->PerformSolidColorAnalysis(gfx::Rect(0, 0, 400, 400), 1.f, &analysis);
 
   EXPECT_TRUE(analysis.is_solid_color);
   EXPECT_EQ(analysis.solid_color, SkColorSetARGB(0, 0, 0, 0));
 }
 
+TEST(PicturePileImplTest, PixelRefIteratorEmpty) {
+  gfx::Size tile_size(128, 128);
+  gfx::Size layer_bounds(256, 256);
+
+  // Create a filled pile with no recording.
+  scoped_refptr<FakePicturePileImpl> pile =
+      FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
+
+  // Tile sized iterators.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 128, 128), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 256, 256), 2.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 64, 64), 0.5, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  // Shifted tile sized iterators.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(140, 140, 128, 128), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(280, 280, 256, 256), 2.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(70, 70, 64, 64), 0.5, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  // Layer sized iterators.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 256, 256), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 512, 512), 2.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 128, 128), 0.5, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+}
+
+TEST(PicturePileImplTest, PixelRefIteratorNoDiscardableRefs) {
+  gfx::Size tile_size(128, 128);
+  gfx::Size layer_bounds(256, 256);
+
+  scoped_ptr<FakePicturePile> recording_source =
+      FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
+  SkPaint simple_paint;
+  simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
+
+  SkBitmap non_discardable_bitmap;
+  CreateBitmap(gfx::Size(128, 128), "notdiscardable", &non_discardable_bitmap);
+
+  recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
+                                             simple_paint);
+  recording_source->add_draw_rect_with_paint(gfx::Rect(128, 128, 512, 512),
+                                             simple_paint);
+  recording_source->add_draw_rect_with_paint(gfx::Rect(512, 0, 256, 256),
+                                             simple_paint);
+  recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256),
+                                             simple_paint);
+  recording_source->add_draw_bitmap(non_discardable_bitmap, gfx::Point(128, 0));
+  recording_source->add_draw_bitmap(non_discardable_bitmap, gfx::Point(0, 128));
+  recording_source->add_draw_bitmap(non_discardable_bitmap,
+                                    gfx::Point(150, 150));
+  recording_source->RerecordPile();
+
+  scoped_refptr<FakePicturePileImpl> pile =
+      FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
+
+  // Tile sized iterators.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 128, 128), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 256, 256), 2.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 64, 64), 0.5, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  // Shifted tile sized iterators.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(140, 140, 128, 128), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(280, 280, 256, 256), 2.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(70, 70, 64, 64), 0.5, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  // Layer sized iterators.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 256, 256), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 512, 512), 2.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 128, 128), 0.5, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+}
+
+TEST(PicturePileImplTest, PixelRefIteratorDiscardableRefs) {
+  gfx::Size tile_size(128, 128);
+  gfx::Size layer_bounds(256, 256);
+
+  scoped_ptr<FakePicturePile> recording_source =
+      FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
+
+  SkBitmap discardable_bitmap[2][2];
+  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[0][0]);
+  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[1][0]);
+  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[1][1]);
+
+  // Discardable pixel refs are found in the following cells:
+  // |---|---|
+  // | x |   |
+  // |---|---|
+  // | x | x |
+  // |---|---|
+  recording_source->add_draw_bitmap(discardable_bitmap[0][0], gfx::Point(0, 0));
+  recording_source->add_draw_bitmap(discardable_bitmap[1][0],
+                                    gfx::Point(0, 130));
+  recording_source->add_draw_bitmap(discardable_bitmap[1][1],
+                                    gfx::Point(140, 140));
+  recording_source->RerecordPile();
+
+  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, 128, 128), 1.0, pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 256, 256), 2.0, pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(0, 0, 64, 64), 0.5, pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+  // Shifted tile sized iterators. These should find only one pixel ref.
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(140, 140, 128, 128), 1.0, pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(280, 280, 256, 256), 2.0, pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(70, 70, 64, 64), 0.5, pile.get());
+    EXPECT_TRUE(iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+  // Ensure there's no discardable pixel refs in the empty cell
+  {
+    PicturePileImpl::PixelRefIterator iterator(
+        gfx::Rect(140, 0, 128, 128), 1.0, pile.get());
+    EXPECT_FALSE(iterator);
+  }
+  // Layer sized iterators. These should find all 3 pixel refs.
+  {
+    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);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][0].pixelRef());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    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);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][0].pixelRef());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    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);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][0].pixelRef());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+}
+
 TEST(PicturePileImplTest, PixelRefIteratorDiscardableRefsOneTile) {
   gfx::Size tile_size(256, 256);
   gfx::Size layer_bounds(512, 512);
 
   scoped_ptr<FakePicturePile> recording_source =
       FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
 
   SkBitmap discardable_bitmap[2][2];
   CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[0][0]);
   CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[0][1]);
   CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[1][1]);
 
   // Discardable pixel refs are found in the following cells:
   // |---|---|
   // | x | x |
   // |---|---|
   // |   | x |
   // |---|---|
   recording_source->add_draw_bitmap(discardable_bitmap[0][0], gfx::Point(0, 0));
   recording_source->add_draw_bitmap(discardable_bitmap[0][1],
                                     gfx::Point(260, 0));
   recording_source->add_draw_bitmap(discardable_bitmap[1][1],
                                     gfx::Point(260, 260));
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
 
   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());
@@ skipping 91 matching lines @@
   EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
   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);
 }
 
+TEST(PicturePileImplTest, PixelRefIteratorDiscardableRefsBaseNonDiscardable) {
+  gfx::Size tile_size(256, 256);
+  gfx::Size layer_bounds(512, 512);
+
+  scoped_ptr<FakePicturePile> recording_source =
+      FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
+
+  SkBitmap non_discardable_bitmap;
+  CreateBitmap(gfx::Size(512, 512), "notdiscardable", &non_discardable_bitmap);
+
+  SkBitmap discardable_bitmap[2][2];
+  CreateBitmap(gfx::Size(128, 128), "discardable", &discardable_bitmap[0][0]);
+  CreateBitmap(gfx::Size(128, 128), "discardable", &discardable_bitmap[0][1]);
+  CreateBitmap(gfx::Size(128, 128), "discardable", &discardable_bitmap[1][1]);
+
+  // One large non-discardable bitmap covers the whole grid.
+  // Discardable pixel refs are found in the following cells:
+  // |---|---|
+  // | x | x |
+  // |---|---|
+  // |   | x |
+  // |---|---|
+  recording_source->add_draw_bitmap(non_discardable_bitmap, gfx::Point(0, 0));
+  recording_source->add_draw_bitmap(discardable_bitmap[0][0], gfx::Point(0, 0));
+  recording_source->add_draw_bitmap(discardable_bitmap[0][1],
+                                    gfx::Point(260, 0));
+  recording_source->add_draw_bitmap(discardable_bitmap[1][1],
+                                    gfx::Point(260, 260));
+  recording_source->RerecordPile();
+
+  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_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_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_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_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_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_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);
+    EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    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);
+    EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    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);
+    EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
+    EXPECT_TRUE(++iterator);
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
+    EXPECT_FALSE(++iterator);
+  }
+}
+
 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);
   recording_source->SetBackgroundColor(SK_ColorBLACK);
   recording_source->SetIsSolidColor(false);
   recording_source->SetRequiresClear(false);
   recording_source->SetClearCanvasWithDebugColor(false);
 
   // Because the caller sets content opaque, it also promises that it
   // has at least filled in layer_bounds opaquely.
   SkPaint white_paint;
   white_paint.setColor(SK_ColorWHITE);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              white_paint);
 
   recording_source->SetMinContentsScale(contents_scale);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   gfx::Size content_bounds(
       gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
 
   // Simulate drawing into different tiles at different offsets.
   int step_x = std::ceil(content_bounds.width() / raster_divisions);
   int step_y = std::ceil(content_bounds.height() / raster_divisions);
@@ skipping 39 matching lines @@
   gfx::Size tile_size(1000, 1000);
   gfx::Size layer_bounds(5, 3);
   float contents_scale = 0.5f;
 
   scoped_ptr<FakePicturePile> recording_source =
       FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
   recording_source->SetBackgroundColor(SK_ColorTRANSPARENT);
   recording_source->SetRequiresClear(true);
   recording_source->SetMinContentsScale(contents_scale);
   recording_source->SetClearCanvasWithDebugColor(false);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
   gfx::Size content_bounds(
       gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
 
   gfx::Rect canvas_rect(content_bounds);
   canvas_rect.Inset(0, 0, -1, -1);
 
   SkBitmap bitmap;
@@ skipping 29 matching lines @@
   recording_source->SetMinContentsScale(MinContentsScale());
   recording_source->SetClearCanvasWithDebugColor(true);
 
   SkPaint color_paint;
   color_paint.setColor(test_color);
   // Additive paint, so that if two paints overlap, the color will change.
   color_paint.setXfermodeMode(SkXfermode::kPlus_Mode);
   // Paint outside the layer to make sure that blending works.
   recording_source->add_draw_rect_with_paint(
       gfx::RectF(bigger_than_layer_bounds), color_paint);
-  recording_source->Rerecord();
+  recording_source->RerecordPile();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
   gfx::Size content_bounds(
       gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
   SkCanvas canvas(bitmap);
 
@@ skipping 40 matching lines @@
       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->Rerecord();
+  recording_source->RerecordPile();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
   // Sanity check that bitmaps 0-2 intersect the borders of their adjacent
   // tiles, but not the actual tiles.
   EXPECT_TRUE(
       bitmap_rects[0].Intersects(pile->tiling().TileBoundsWithBorder(1, 0)));
   EXPECT_FALSE(bitmap_rects[0].Intersects(pile->tiling().TileBounds(1, 0)));
   EXPECT_TRUE(
@@ skipping 38 matching lines @@
     EXPECT_TRUE(iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[1].pixelRef());
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[2].pixelRef());
     EXPECT_FALSE(++iterator);
   }
 }
 
 }  // namespace
 }  // namespace cc