cc: Remove invalidation history

cc/resources/picture_pile_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 <map>
 #include <utility>
 
 #include "cc/resources/picture_pile.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_picture_pile.h"
@@ skipping 133 matching lines @@
 
 TEST_F(PicturePileTest, SmallInvalidateInflated) {
   // Invalidate something inside a tile.
   Region invalidate_rect(gfx::Rect(50, 50, 1, 1));
   UpdateAndExpandInvalidation(&invalidate_rect, tiling_size(), tiling_rect());
   EXPECT_EQ(gfx::Rect(50, 50, 1, 1).ToString(), invalidate_rect.ToString());
 
   EXPECT_EQ(1, pile_.tiling().num_tiles_x());
   EXPECT_EQ(1, pile_.tiling().num_tiles_y());
 
-  FakePicturePile::PictureInfo& picture_info =
-      pile_.picture_map().find(FakePicturePile::PictureMapKey(0, 0))->second;
-  // We should have a picture.
-  EXPECT_TRUE(!!picture_info.GetPicture());
-  gfx::Rect picture_rect = gfx::ScaleToEnclosedRect(
-      picture_info.GetPicture()->LayerRect(), min_scale_);
+  PicturePile::PictureMapKey key = FakePicturePile::PictureMapKey(0, 0);
+  PicturePile::PictureMap::iterator it = pile_.picture_map().find(key);
+  EXPECT_TRUE(it != pile_.picture_map().end());
+  const Picture* picture = it->second.get();
+  EXPECT_TRUE(picture);
+
+  gfx::Rect picture_rect =
+      gfx::ScaleToEnclosedRect(picture->LayerRect(), min_scale_);
 
   // The the picture should be large enough that scaling it never makes a rect
   // smaller than 1 px wide or tall.
-  EXPECT_FALSE(picture_rect.IsEmpty()) << "Picture rect " <<
-      picture_rect.ToString();
+  EXPECT_FALSE(picture_rect.IsEmpty()) << "Picture rect "
+                                       << picture_rect.ToString();
 }
 
 TEST_F(PicturePileTest, LargeInvalidateInflated) {
   // Invalidate something inside a tile.
   Region invalidate_rect(gfx::Rect(50, 50, 100, 100));
   UpdateAndExpandInvalidation(&invalidate_rect, tiling_size(), tiling_rect());
   EXPECT_EQ(gfx::Rect(50, 50, 100, 100).ToString(), invalidate_rect.ToString());
 
   EXPECT_EQ(1, pile_.tiling().num_tiles_x());
   EXPECT_EQ(1, pile_.tiling().num_tiles_y());
 
-  FakePicturePile::PictureInfo& picture_info =
-      pile_.picture_map().find(FakePicturePile::PictureMapKey(0, 0))->second;
-  EXPECT_TRUE(!!picture_info.GetPicture());
+  PicturePile::PictureMapKey key = FakePicturePile::PictureMapKey(0, 0);
+  PicturePile::PictureMap::iterator it = pile_.picture_map().find(key);
+  EXPECT_TRUE(it != pile_.picture_map().end());
+  const Picture* picture = it->second.get();
+  EXPECT_TRUE(picture);
 
   int expected_inflation = pile_.buffer_pixels();
 
-  const Picture* base_picture = picture_info.GetPicture();
   gfx::Rect base_picture_rect(tiling_size());
   base_picture_rect.Inset(-expected_inflation, -expected_inflation);
-  EXPECT_EQ(base_picture_rect.ToString(),
-            base_picture->LayerRect().ToString());
-}
-
-TEST_F(PicturePileTest, InvalidateOnTileBoundaryInflated) {

[enne (OOO), 2015/04/07 01:03:50]

I need to check if this is tested elsewhere, or if this just happens to use
invalidation frequency to test this path.

[vmpstr, 2015/04/07 17:43:14]

Ya, we should retain these tests if possible.

[enne (OOO), 2015/04/07 17:59:43]

I think InvalidationOnTileBorderOutsideInterestRect covers the tests I want to
keep from here, with respect to border pixels and invalidations.

-  gfx::Size new_tiling_size =
-      gfx::ToCeiledSize(gfx::ScaleSize(tiling_size(), 2.f));
-  // This creates initial pictures.
-  SetTilingSize(new_tiling_size);
-
-  // Due to border pixels, we should have 3 tiles.
-  EXPECT_EQ(3, pile_.tiling().num_tiles_x());
-  EXPECT_EQ(3, pile_.tiling().num_tiles_y());
-
-  // We should have 1/.125 - 1 = 7 border pixels.
-  EXPECT_EQ(7, pile_.buffer_pixels());
-  EXPECT_EQ(7, pile_.tiling().border_texels());
-
-  // Invalidate everything to have a non zero invalidation frequency.
-  UpdateWholePile();
-
-  // Invalidate something just over a tile boundary by a single pixel.
-  // This will invalidate the tile (1, 1), as well as 1 row of pixels in (1, 0).
-  Region invalidate_rect(
-      gfx::Rect(pile_.tiling().TileBoundsWithBorder(0, 0).right(),
-                pile_.tiling().TileBoundsWithBorder(0, 0).bottom() - 1,
-                50,
-                50));
-  Region expected_invalidation = invalidate_rect;
-  UpdateAndExpandInvalidation(&invalidate_rect, tiling_size(), tiling_rect());
-  EXPECT_EQ(expected_invalidation.ToString(), invalidate_rect.ToString());
-
-  for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
-    for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
-      FakePicturePile::PictureInfo& picture_info =
-          pile_.picture_map()
-              .find(FakePicturePile::PictureMapKey(i, j))
-              ->second;
-
-      // Expect (1, 1) and (1, 0) to be invalidated once more
-      // than the rest of the tiles.
-      if (i == 1 && (j == 0 || j == 1)) {
-        EXPECT_FLOAT_EQ(
-            2.0f / FakePicturePile::PictureInfo::INVALIDATION_FRAMES_TRACKED,
-            picture_info.GetInvalidationFrequencyForTesting());
-      } else {
-        EXPECT_FLOAT_EQ(
-            1.0f / FakePicturePile::PictureInfo::INVALIDATION_FRAMES_TRACKED,
-            picture_info.GetInvalidationFrequencyForTesting());
-      }
-    }
-  }
-}
-
-TEST_F(PicturePileTest, InvalidateOnFullLayer) {
-  UpdateWholePile();
-
-  // Everything was invalidated once so far.
-  for (auto& it : pile_.picture_map()) {
-    EXPECT_FLOAT_EQ(
-        1.0f / FakePicturePile::PictureInfo::INVALIDATION_FRAMES_TRACKED,
-        it.second.GetInvalidationFrequencyForTesting());
-  }
-
-  // Invalidate everything,
-  Region invalidation = tiling_rect();
-  UpdateAndExpandInvalidation(&invalidation, tiling_size(), tiling_rect());
-
-  // Everything was invalidated again.
-  for (auto& it : pile_.picture_map()) {
-    EXPECT_FLOAT_EQ(
-        2.0f / FakePicturePile::PictureInfo::INVALIDATION_FRAMES_TRACKED,
-        it.second.GetInvalidationFrequencyForTesting());
-  }
-}
-
-TEST_F(PicturePileTest, StopRecordingOffscreenInvalidations) {
-  gfx::Size new_tiling_size =
-      gfx::ToCeiledSize(gfx::ScaleSize(tiling_size(), 4.f));
-  SetTilingSize(new_tiling_size);
-
-  gfx::Rect viewport(tiling_size().width(), 1);
-
-  // Update the whole pile until the invalidation frequency is high.
-  for (int frame = 0; frame < 33; ++frame) {
-    UpdateWholePile();
-  }
-
-  // Make sure we have a high invalidation frequency.
-  for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
-    for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
-      FakePicturePile::PictureInfo& picture_info =
-          pile_.picture_map()
-              .find(FakePicturePile::PictureMapKey(i, j))
-              ->second;
-      EXPECT_FLOAT_EQ(1.0f, picture_info.GetInvalidationFrequencyForTesting())
-          << "i " << i << " j " << j;
-    }
-  }
-
-  // Update once more with a small viewport.
-  Region invalidation(tiling_rect());
-  UpdateAndExpandInvalidation(&invalidation, tiling_size(), viewport);
-  EXPECT_EQ(tiling_rect().ToString(), invalidation.ToString());
-
-  bool had_tiles_with_no_pictures = false;
-  for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
-    for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
-      FakePicturePile::PictureInfo& picture_info =
-          pile_.picture_map()
-              .find(FakePicturePile::PictureMapKey(i, j))
-              ->second;
-      EXPECT_FLOAT_EQ(1.0f, picture_info.GetInvalidationFrequencyForTesting());
-
-      // If the y far enough away we expect to find no picture (no re-recording
-      // happened). For close y, the picture should change.
-      if (j >= 3) {
-        EXPECT_FALSE(picture_info.GetPicture()) << "i " << i << " j " << j;
-        had_tiles_with_no_pictures = true;
-      } else {
-        EXPECT_TRUE(picture_info.GetPicture()) << "i " << i << " j " << j;
-      }
-    }
-  }
-
-  EXPECT_TRUE(had_tiles_with_no_pictures);
-
-  // Update a partial tile that doesn't get recorded. We should expand the
-  // invalidation to the entire tiles that overlap it.
-  Region small_invalidation =
-      gfx::Rect(pile_.tiling().TileBounds(3, 4).x(),
-                pile_.tiling().TileBounds(3, 4).y() + 10,
-                1,
-                1);
-  UpdateAndExpandInvalidation(&small_invalidation, tiling_size(), viewport);
-  EXPECT_TRUE(small_invalidation.Contains(gfx::UnionRects(
-      pile_.tiling().TileBounds(2, 4), pile_.tiling().TileBounds(3, 4))))
-      << small_invalidation.ToString();
-
-  // Now update with no invalidation and full viewport
-  Region empty_invalidation;
-  UpdateAndExpandInvalidation(&empty_invalidation, tiling_size(),
-                              tiling_rect());
-  EXPECT_EQ(Region().ToString(), empty_invalidation.ToString());
-
-  for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
-    for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
-      FakePicturePile::PictureInfo& picture_info =
-          pile_.picture_map()
-              .find(FakePicturePile::PictureMapKey(i, j))
-              ->second;
-      // Expect the invalidation frequency to be less than 1, since we just
-      // updated with no invalidations.
-      EXPECT_LT(picture_info.GetInvalidationFrequencyForTesting(), 1.f);
-
-      // We expect that there are pictures everywhere now.
-      EXPECT_TRUE(picture_info.GetPicture()) << "i " << i << " j " << j;
-    }
-  }
+  EXPECT_EQ(base_picture_rect.ToString(), picture->LayerRect().ToString());
 }
 
 TEST_F(PicturePileTest, ClearingInvalidatesRecordedRect) {
   gfx::Rect rect(0, 0, 5, 5);
   EXPECT_TRUE(pile_.CanRasterLayerRect(rect));
   EXPECT_TRUE(pile_.CanRasterSlowTileCheck(rect));
 
   pile_.Clear();
 
   // Make sure both the cache-aware check (using recorded region) and the normal
   // check are both false after clearing.
   EXPECT_FALSE(pile_.CanRasterLayerRect(rect));
   EXPECT_FALSE(pile_.CanRasterSlowTileCheck(rect));
 }
 
-TEST_F(PicturePileTest, FrequentInvalidationCanRaster) {
-  // This test makes sure that if part of the page is frequently invalidated
-  // and doesn't get re-recorded, then CanRaster is not true for any
-  // tiles touching it, but is true for adjacent tiles, even if it
-  // overlaps on borders (edge case).
-  gfx::Size new_tiling_size =
-      gfx::ToCeiledSize(gfx::ScaleSize(tiling_size(), 4.f));
-  SetTilingSize(new_tiling_size);
-
-  gfx::Rect tile02_borders = pile_.tiling().TileBoundsWithBorder(0, 2);
-  gfx::Rect tile03_borders = pile_.tiling().TileBoundsWithBorder(0, 3);
-  gfx::Rect tile02_noborders = pile_.tiling().TileBounds(0, 2);
-  gfx::Rect tile03_noborders = pile_.tiling().TileBounds(0, 3);
-
-  // Sanity check these two tiles are overlapping with borders, since this is
-  // what the test is trying to repro.
-  EXPECT_TRUE(tile02_borders.Intersects(tile03_borders));
-  EXPECT_FALSE(tile02_noborders.Intersects(tile03_noborders));
-  UpdateWholePile();
-  EXPECT_TRUE(pile_.CanRasterLayerRect(tile02_noborders));
-  EXPECT_TRUE(pile_.CanRasterSlowTileCheck(tile02_noborders));
-  EXPECT_TRUE(pile_.CanRasterLayerRect(tile03_noborders));
-  EXPECT_TRUE(pile_.CanRasterSlowTileCheck(tile03_noborders));
-  // Sanity check that an initial paint goes down the fast path of having
-  // a valid recorded viewport.
-  EXPECT_TRUE(!pile_.recorded_viewport().IsEmpty());
-
-  // Update the whole layer until the invalidation frequency is high.
-  for (int frame = 0; frame < 33; ++frame) {
-    UpdateWholePile();
-  }
-
-  // Update once more with a small viewport.
-  gfx::Rect viewport(tiling_size().width(), 1);
-  Region invalidation(tiling_rect());
-  UpdateAndExpandInvalidation(&invalidation, tiling_size(), viewport);
-  EXPECT_EQ(tiling_rect().ToString(), invalidation.ToString());
-
-  // Sanity check some pictures exist and others don't.
-  EXPECT_TRUE(pile_.picture_map()
-                  .find(FakePicturePile::PictureMapKey(0, 2))
-                  ->second.GetPicture());
-  EXPECT_FALSE(pile_.picture_map()
-                   .find(FakePicturePile::PictureMapKey(0, 3))
-                   ->second.GetPicture());
-
-  EXPECT_TRUE(pile_.CanRasterLayerRect(tile02_noborders));
-  EXPECT_TRUE(pile_.CanRasterSlowTileCheck(tile02_noborders));
-  EXPECT_FALSE(pile_.CanRasterLayerRect(tile03_noborders));
-  EXPECT_FALSE(pile_.CanRasterSlowTileCheck(tile03_noborders));
-}
-
 TEST_F(PicturePileTest, NoInvalidationValidViewport) {
   // This test validates that the recorded_viewport cache of full tiles
   // is still valid for some use cases.  If it's not, it's a performance
   // issue because CanRaster checks will go down the slow path.
   EXPECT_TRUE(!pile_.recorded_viewport().IsEmpty());
 
   // No invalidation, same viewport.
   Region invalidation;
   UpdateAndExpandInvalidation(&invalidation, tiling_size(), tiling_rect());
   EXPECT_TRUE(!pile_.recorded_viewport().IsEmpty());
@@ skipping 153 matching lines @@
   SetTilingSize(base_tiling_size);
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   UpdateAndExpandInvalidation(
       &invalidation,
       grow_down_tiling_size,
       CornerSinglePixelRect(corner, grow_down_tiling_size));
 
   // We should have lost all of the recordings in the bottom row as none of them
   // are in the current interest rect (which is either the above or below it).
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(8, pile_.tiling().num_tiles_y());
   for (int i = 0; i < 6; ++i) {
     for (int j = 0; j < 6; ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_EQ(j < 5, it != map.end() && it->second.GetPicture());
+      EXPECT_EQ(j < 5, it != map.end() && it->second.get());
     }
   }
 
   // We invalidated all new pixels in the recording.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_down_tiling_size),
                                           gfx::Rect(base_tiling_size));
   // But the new pixels don't cover the whole bottom row.
   gfx::Rect bottom_row = gfx::UnionRects(pile_.tiling().TileBounds(0, 5),
                                          pile_.tiling().TileBounds(5, 5));
   EXPECT_FALSE(expected_invalidation.Contains(bottom_row));
@@ skipping 24 matching lines @@
           break;
         case BOTTOM_LEFT:
           // The interest rect in the bottom left tile means we'll record it.
           expect_tile = j < 5 || (j == 5 && i == 0);
           break;
         case BOTTOM_RIGHT:
           // The interest rect in the bottom right tile means we'll record it.
           expect_tile = j < 5 || (j == 5 && i == 5);
           break;
       }
-      EXPECT_EQ(expect_tile, it != map.end() && it->second.GetPicture());
+      EXPECT_EQ(expect_tile, it != map.end() && it->second.get());
     }
   }
 
   // When shrinking, the previously exposed region is invalidated.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_down_tiling_size),
                                           gfx::Rect(base_tiling_size));
   // The whole bottom row of tiles (except any with the interest rect) are
   // dropped.
   gfx::Rect bottom_row_minus_existing_corner = gfx::UnionRects(
       pile_.tiling().TileBounds(0, 5), pile_.tiling().TileBounds(5, 5));
@@ skipping 26 matching lines @@
   // We should have lost all of the recordings in the right column as none of
   // them are in the current interest rect (which is either entirely left or
   // right of it).
   EXPECT_EQ(8, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < 6; ++i) {
     for (int j = 0; j < 6; ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_EQ(i < 5, it != map.end() && it->second.GetPicture());
+      EXPECT_EQ(i < 5, it != map.end() && it->second.get());
     }
   }
 
   // We invalidated all new pixels in the recording.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_right_tiling_size),
                                           gfx::Rect(base_tiling_size));
   // But the new pixels don't cover the whole right_column.
   gfx::Rect right_column = gfx::UnionRects(pile_.tiling().TileBounds(5, 0),
                                            pile_.tiling().TileBounds(5, 5));
   EXPECT_FALSE(expected_invalidation.Contains(right_column));
@@ skipping 26 matching lines @@
           break;
         case TOP_RIGHT:
           // The interest rect in the top right tile means we'll record it.
           expect_tile = i < 5 || (j == 0 && i == 5);
           break;
         case BOTTOM_RIGHT:
           // The interest rect in the bottom right tile means we'll record it.
           expect_tile = i < 5 || (j == 5 && i == 5);
           break;
       }
-      EXPECT_EQ(expect_tile, it != map.end() && it->second.GetPicture());
+      EXPECT_EQ(expect_tile, it != map.end() && it->second.get());
     }
   }
 
   // When shrinking, the previously exposed region is invalidated.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_right_tiling_size),
                                           gfx::Rect(base_tiling_size));
   // The whole right column of tiles (except for ones with the interest rect)
   // are dropped.
   gfx::Rect right_column_minus_existing_corner = gfx::UnionRects(
       pile_.tiling().TileBounds(5, 0), pile_.tiling().TileBounds(5, 5));
@@ skipping 21 matching lines @@
       CornerSinglePixelRect(corner, grow_both_tiling_size));
 
   // We should have lost the recordings in the right column and bottom row.
   EXPECT_EQ(8, pile_.tiling().num_tiles_x());
   EXPECT_EQ(8, pile_.tiling().num_tiles_y());
   for (int i = 0; i < 6; ++i) {
     for (int j = 0; j < 6; ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_EQ(i < 5 && j < 5, it != map.end() && it->second.GetPicture());
+      EXPECT_EQ(i < 5 && j < 5, it != map.end() && it->second.get());
     }
   }
 
   // We invalidated all new pixels in the recording.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_both_tiling_size),
                                           gfx::Rect(base_tiling_size));
   // But the new pixels don't cover the whole right column or bottom row.
   Region right_column_and_bottom_row =
       UnionRegions(gfx::UnionRects(pile_.tiling().TileBounds(5, 0),
                                    pile_.tiling().TileBounds(5, 5)),
@@ skipping 29 matching lines @@
           break;
         case BOTTOM_LEFT:
           // The interest rect in the bottom left tile means we'll record it.
           expect_tile = (i < 5 && j < 5) || (j == 5 && i == 0);
           break;
         case BOTTOM_RIGHT:
           // The interest rect in the bottom right tile means we'll record it.
           expect_tile = (i < 5 && j < 5) || (j == 5 && i == 5);
           break;
       }
-      EXPECT_EQ(expect_tile, it != map.end() && it->second.GetPicture())
-          << i << "," << j;
+      EXPECT_EQ(expect_tile, it != map.end() && it->second.get()) << i << ","
+                                                                  << j;
     }
   }
 
   // We invalidated all previous pixels in the recording.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_both_tiling_size),
                                           gfx::Rect(base_tiling_size));
   // The whole right column and bottom row of tiles (except for ones with the
   // interest rect) are dropped.
   Region right_column_and_bottom_row_minus_existing_corner =
       right_column_and_bottom_row;
@@ skipping 43 matching lines @@
   SetTilingSize(base_tiling_size);
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // In this test (unlike the large resize test), as all growing and shrinking
   // happens within tiles, the resulting invalidation is symmetrical, so use
   // this enum to repeat the test both ways.
   enum ChangeDirection { GROW, SHRINK, LAST_DIRECTION = SHRINK };
 
   // Grow downward.
   for (int dir = 0; dir <= LAST_DIRECTION; ++dir) {
@@ skipping 20 matching lines @@
             break;
           case BOTTOM_LEFT:
             // The interest rect in the bottom left tile means we'll record it.
             expect_tile = j < 5 || (j == 5 && i == 0);
             break;
           case BOTTOM_RIGHT:
             // The interest rect in the bottom right tile means we'll record it.
             expect_tile = j < 5 || (j == 5 && i == 5);
             break;
         }
-        EXPECT_EQ(expect_tile, it != map.end() && it->second.GetPicture());
+        EXPECT_EQ(expect_tile, it != map.end() && it->second.get());
       }
     }
 
     // We invalidated the bottom row outside the new interest rect. The tile
     // that insects the interest rect in invalidated only on its newly
     // exposed or previously exposed pixels.
     if (dir == GROW) {
       // Only calculate the expected invalidation while growing, as the tile
       // bounds post-growing is the newly exposed / previously exposed sizes.
       // Post-shrinking, the tile bounds are smaller, so can't be used.
@@ skipping 45 matching lines @@
             break;
           case TOP_RIGHT:
             // The interest rect in the top right tile means we'll record it.
             expect_tile = i < 5 || (j == 0 && i == 5);
             break;
           case BOTTOM_RIGHT:
             // The interest rect in the bottom right tile means we'll record it.
             expect_tile = i < 5 || (j == 5 && i == 5);
             break;
         }
-        EXPECT_EQ(expect_tile, it != map.end() && it->second.GetPicture());
+        EXPECT_EQ(expect_tile, it != map.end() && it->second.get());
       }
     }
 
     // We invalidated the right column outside the new interest rect. The tile
     // that insects the interest rect in invalidated only on its new or
     // previously exposed pixels.
     if (dir == GROW) {
       // Calculate the expected invalidation the first time through the loop.
       switch (corner) {
         case TOP_LEFT:
@@ skipping 48 matching lines @@
             break;
           case BOTTOM_LEFT:
             // The interest rect in the bottom left tile means we'll record it.
             expect_tile = (i < 5 && j < 5) || (j == 5 && i == 0);
             break;
           case BOTTOM_RIGHT:
             // The interest rect in the bottom right tile means we'll record it.
             expect_tile = (i < 5 && j < 5) || (j == 5 && i == 5);
             break;
         }
-        EXPECT_EQ(expect_tile, it != map.end() && it->second.GetPicture())
-            << i << "," << j;
+        EXPECT_EQ(expect_tile, it != map.end() && it->second.get()) << i << ","
+                                                                    << j;
       }
     }
 
     // We invalidated the right column and the bottom row outside the new
     // interest rect. The tile that insects the interest rect in invalidated
     // only on its new or previous exposed pixels.
     if (dir == GROW) {
       // Calculate the expected invalidation the first time through the loop.
       switch (corner) {
         case TOP_LEFT:
@@ skipping 59 matching lines @@
   SetTilingSize(base_tiling_size);
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   UpdateAndExpandInvalidation(
       &invalidation, grow_down_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(8, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the newly exposed pixels on the bottom row of tiles.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_down_tiling_size),
                                           gfx::Rect(base_tiling_size));
   Region bottom_row_new_pixels =
       SubtractRegions(gfx::UnionRects(pile_.tiling().TileBounds(0, 5),
                                       pile_.tiling().TileBounds(5, 5)),
                       gfx::Rect(base_tiling_size));
   EXPECT_TRUE(expected_invalidation.Contains(bottom_row_new_pixels));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the previously exposed pixels on the bottom row of tiles.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_down_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_TRUE(expected_invalidation.Contains(bottom_row_new_pixels));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
       &invalidation, grow_right_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(8, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the newly exposed pixels on the right column of tiles.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_right_tiling_size),
                                           gfx::Rect(base_tiling_size));
   Region right_column_new_pixels =
       SubtractRegions(gfx::UnionRects(pile_.tiling().TileBounds(5, 0),
                                       pile_.tiling().TileBounds(5, 5)),
                       gfx::Rect(base_tiling_size));
   EXPECT_TRUE(expected_invalidation.Contains(right_column_new_pixels));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings that are now outside the tiling only.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the previously exposed pixels on the right column of tiles.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_right_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_TRUE(expected_invalidation.Contains(right_column_new_pixels));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
       &invalidation, grow_both_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(8, pile_.tiling().num_tiles_x());
   EXPECT_EQ(8, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the newly exposed pixels on the bottom row and right column
   // of tiles.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_both_tiling_size),
                                           gfx::Rect(base_tiling_size));
   Region bottom_row_and_right_column_new_pixels = SubtractRegions(
       UnionRegions(gfx::UnionRects(pile_.tiling().TileBounds(0, 5),
                                    pile_.tiling().TileBounds(5, 5)),
                    gfx::UnionRects(pile_.tiling().TileBounds(5, 0),
                                    pile_.tiling().TileBounds(5, 5))),
       gfx::Rect(base_tiling_size));
   EXPECT_TRUE(
       expected_invalidation.Contains(bottom_row_and_right_column_new_pixels));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect());
 
   // We should have lost the recordings that are now outside the tiling only.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the previously exposed pixels on the bottom row and right
   // column of tiles.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_both_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_TRUE(
       expected_invalidation.Contains(bottom_row_and_right_column_new_pixels));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
@@ skipping 17 matching lines @@
   SetTilingSize(base_tiling_size);
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   UpdateAndExpandInvalidation(
       &invalidation, grow_down_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the newly exposed pixels.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_down_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the previously exposed pixels.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_down_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
       &invalidation, grow_right_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the newly exposed pixels.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_right_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings that are now outside the tiling only.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the previously exposed pixels.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_right_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
       &invalidation, grow_both_tiling_size, gfx::Rect(1, 1));
 
   // We should have a recording for every tile.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the newly exposed pixels.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_both_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect());
 
   // We should have lost the recordings that are now outside the tiling only.
   EXPECT_EQ(6, pile_.tiling().num_tiles_x());
   EXPECT_EQ(6, pile_.tiling().num_tiles_y());
   for (int i = 0; i < pile_.tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_.tiling().num_tiles_y(); ++j) {
       FakePicturePile::PictureMapKey key(i, j);
       FakePicturePile::PictureMap& map = pile_.picture_map();
       FakePicturePile::PictureMap::iterator it = map.find(key);
-      EXPECT_TRUE(it != map.end() && it->second.GetPicture());
+      EXPECT_TRUE(it != map.end() && it->second.get());
     }
   }
 
   // We invalidated the previously exposed pixels.
   expected_invalidation = SubtractRegions(gfx::Rect(grow_both_tiling_size),
                                           gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 }
 
@@ skipping 74 matching lines @@
   EXPECT_TRUE(pile_.HasRecordings());
   pile_.SetEmptyBounds();
   EXPECT_FALSE(pile_.is_solid_color());
   EXPECT_TRUE(pile_.GetSize().IsEmpty());
   EXPECT_TRUE(pile_.picture_map().empty());
   EXPECT_FALSE(pile_.HasRecordings());
 }
 
 }  // namespace
 }  // namespace cc