cc: Give TilingData back a Size instead of a Rect.

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_rendering_stats_instrumentation.h"
@@ skipping 28 matching lines @@
 class PicturePileTest : public testing::Test {
  public:
   PicturePileTest()
       : pile_(new TestPicturePile()),
         background_color_(SK_ColorBLUE),
         min_scale_(0.125),
         frame_number_(0),
         contents_opaque_(false) {
     pile_->SetTileGridSize(gfx::Size(1000, 1000));
     pile_->SetMinContentsScale(min_scale_);
-    SetTilingRect(gfx::Rect(pile_->tiling().max_texture_size()));
+    SetTilingSize(pile_->tiling().max_texture_size());
   }
 
-  void SetTilingRect(const gfx::Rect& tiling_rect) {
+  void SetTilingSize(const gfx::Size& tiling_size) {
     Region invalidation;
-    UpdateAndExpandInvalidation(&invalidation, tiling_rect, tiling_rect);
+    gfx::Rect viewport_rect(tiling_size);
+    UpdateAndExpandInvalidation(&invalidation, tiling_size, viewport_rect);
   }
 
-  gfx::Rect tiling_rect() const { return pile_->tiling_rect(); }
+  gfx::Size tiling_size() const { return pile_->tiling_size(); }
+  gfx::Rect tiling_rect() const { return gfx::Rect(pile_->tiling_size()); }
 
   bool UpdateAndExpandInvalidation(Region* invalidation,
-                                   const gfx::Rect& layer_bounds_rect,
+                                   const gfx::Size& layer_size,
                                    const gfx::Rect& visible_layer_rect) {
     frame_number_++;
     return pile_->UpdateAndExpandInvalidation(&client_,
                                               invalidation,
                                               background_color_,
                                               contents_opaque_,
                                               false,
-                                              layer_bounds_rect,
+                                              layer_size,
                                               visible_layer_rect,
                                               frame_number_,
                                               Picture::RECORD_NORMALLY,
                                               &stats_instrumentation_);
   }
 
   bool UpdateWholePile() {
     Region invalidation = tiling_rect();
     bool result = UpdateAndExpandInvalidation(
-        &invalidation, tiling_rect(), tiling_rect());
+        &invalidation, tiling_size(), tiling_rect());
     EXPECT_EQ(tiling_rect().ToString(), invalidation.ToString());
     return result;
   }
 
   FakeContentLayerClient client_;
   FakeRenderingStatsInstrumentation stats_instrumentation_;
   scoped_refptr<TestPicturePile> pile_;
   SkColor background_color_;
   float min_scale_;
   int frame_number_;
   bool contents_opaque_;
 };
 
 TEST_F(PicturePileTest, SmallInvalidateInflated) {
   // Invalidate something inside a tile.
   Region invalidate_rect(gfx::Rect(50, 50, 1, 1));
-  UpdateAndExpandInvalidation(&invalidate_rect, tiling_rect(), tiling_rect());
+  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());
 
   TestPicturePile::PictureInfo& picture_info =
       pile_->picture_map().find(TestPicturePile::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_);
 
   // 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();
 }
 
 TEST_F(PicturePileTest, LargeInvalidateInflated) {
   // Invalidate something inside a tile.
   Region invalidate_rect(gfx::Rect(50, 50, 100, 100));
-  UpdateAndExpandInvalidation(&invalidate_rect, tiling_rect(), tiling_rect());
+  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());
 
   TestPicturePile::PictureInfo& picture_info =
       pile_->picture_map().find(TestPicturePile::PictureMapKey(0, 0))->second;
   EXPECT_TRUE(!!picture_info.GetPicture());
 
   int expected_inflation = pile_->buffer_pixels();
 
   Picture* base_picture = picture_info.GetPicture();
-  gfx::Rect base_picture_rect = pile_->tiling_rect();
+  gfx::Rect base_picture_rect(pile_->tiling_size());
   base_picture_rect.Inset(-expected_inflation, -expected_inflation);
   EXPECT_EQ(base_picture_rect.ToString(),
             base_picture->LayerRect().ToString());
 }
 
 TEST_F(PicturePileTest, InvalidateOnTileBoundaryInflated) {
-  gfx::Rect new_tiling_rect =
-      gfx::ToEnclosedRect(gfx::ScaleRect(pile_->tiling_rect(), 2.f));
+  gfx::Size new_tiling_size =
+      gfx::ToCeiledSize(gfx::ScaleSize(pile_->tiling_size(), 2.f));
   // This creates initial pictures.
-  SetTilingRect(new_tiling_rect);
+  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_rect(), tiling_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) {
       TestPicturePile::PictureInfo& picture_info =
           pile_->picture_map()
               .find(TestPicturePile::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 / TestPicturePile::PictureInfo::INVALIDATION_FRAMES_TRACKED,
             picture_info.GetInvalidationFrequencyForTesting());
       } else {
         EXPECT_FLOAT_EQ(
             1.0f / TestPicturePile::PictureInfo::INVALIDATION_FRAMES_TRACKED,
             picture_info.GetInvalidationFrequencyForTesting());
       }
     }
   }
 }
 
 TEST_F(PicturePileTest, StopRecordingOffscreenInvalidations) {
-  gfx::Rect new_tiling_rect =
-      gfx::ToEnclosedRect(gfx::ScaleRect(pile_->tiling_rect(), 4.f));
-  SetTilingRect(new_tiling_rect);
+  gfx::Size new_tiling_size =
+      gfx::ToCeiledSize(gfx::ScaleSize(pile_->tiling_size(), 4.f));
+  SetTilingSize(new_tiling_size);
 
-  gfx::Rect viewport(
-      tiling_rect().x(), tiling_rect().y(), tiling_rect().width(), 1);
+  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) {
       TestPicturePile::PictureInfo& picture_info =
           pile_->picture_map()
               .find(TestPicturePile::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_rect(), viewport);
+  Region invalidation(tiling_rect());
+  UpdateAndExpandInvalidation(&invalidation, tiling_size(), viewport);
   EXPECT_EQ(tiling_rect().ToString(), invalidation.ToString());
 
   for (int i = 0; i < pile_->tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_->tiling().num_tiles_y(); ++j) {
       TestPicturePile::PictureInfo& picture_info =
           pile_->picture_map()
               .find(TestPicturePile::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 >= 2)
         EXPECT_FALSE(picture_info.GetPicture()) << "i " << i << " j " << j;
       else
         EXPECT_TRUE(picture_info.GetPicture()) << "i " << i << " j " << j;
     }
   }
 
   // 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_rect(), viewport);
+  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_rect(), tiling_rect());
+      &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) {
       TestPicturePile::PictureInfo& picture_info =
           pile_->picture_map()
               .find(TestPicturePile::PictureMapKey(i, j))
               ->second;
       // Expect the invalidation frequency to be less than 1, since we just
       // updated with no invalidations.
@@ skipping 16 matching lines @@
   // 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::Rect new_tiling_rect =
-      gfx::ToEnclosedRect(gfx::ScaleRect(pile_->tiling_rect(), 4.f));
-  SetTilingRect(new_tiling_rect);
+  gfx::Size new_tiling_size =
+      gfx::ToCeiledSize(gfx::ScaleSize(pile_->tiling_size(), 4.f));
+  SetTilingSize(new_tiling_size);
 
   gfx::Rect tile01_borders = pile_->tiling().TileBoundsWithBorder(0, 1);
   gfx::Rect tile02_borders = pile_->tiling().TileBoundsWithBorder(0, 2);
   gfx::Rect tile01_noborders = pile_->tiling().TileBounds(0, 1);
   gfx::Rect tile02_noborders = pile_->tiling().TileBounds(0, 2);
 
   // Sanity check these two tiles are overlapping with borders, since this is
   // what the test is trying to repro.
   EXPECT_TRUE(tile01_borders.Intersects(tile02_borders));
   EXPECT_FALSE(tile01_noborders.Intersects(tile02_noborders));
   UpdateWholePile();
   EXPECT_TRUE(pile_->CanRasterLayerRect(tile01_noborders));
   EXPECT_TRUE(pile_->CanRasterSlowTileCheck(tile01_noborders));
   EXPECT_TRUE(pile_->CanRasterLayerRect(tile02_noborders));
   EXPECT_TRUE(pile_->CanRasterSlowTileCheck(tile02_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(0, 0, tiling_rect().width(), 1);
+  gfx::Rect viewport(tiling_size().width(), 1);
   Region invalidation(tiling_rect());
-  UpdateAndExpandInvalidation(&invalidation, tiling_rect(), viewport);
+  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(TestPicturePile::PictureMapKey(0, 1))
                   ->second.GetPicture());
   EXPECT_FALSE(pile_->picture_map()
                    .find(TestPicturePile::PictureMapKey(0, 2))
                    ->second.GetPicture());
 
   EXPECT_TRUE(pile_->CanRasterLayerRect(tile01_noborders));
   EXPECT_TRUE(pile_->CanRasterSlowTileCheck(tile01_noborders));
   EXPECT_FALSE(pile_->CanRasterLayerRect(tile02_noborders));
   EXPECT_FALSE(pile_->CanRasterSlowTileCheck(tile02_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_rect(), tiling_rect());
+  UpdateAndExpandInvalidation(&invalidation, tiling_size(), tiling_rect());
   EXPECT_TRUE(!pile_->recorded_viewport().IsEmpty());
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
 
   // Partial invalidation, same viewport.
   invalidation = gfx::Rect(0, 0, 1, 1);
-  UpdateAndExpandInvalidation(&invalidation, tiling_rect(), tiling_rect());
+  UpdateAndExpandInvalidation(&invalidation, tiling_size(), tiling_rect());
   EXPECT_TRUE(!pile_->recorded_viewport().IsEmpty());
   EXPECT_EQ(gfx::Rect(0, 0, 1, 1).ToString(), invalidation.ToString());
 
   // No invalidation, changing viewport.
   invalidation = Region();
   UpdateAndExpandInvalidation(
-      &invalidation, tiling_rect(), gfx::Rect(5, 5, 5, 5));
+      &invalidation, tiling_size(), gfx::Rect(5, 5, 5, 5));
   EXPECT_TRUE(!pile_->recorded_viewport().IsEmpty());
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
 }
 
 TEST_F(PicturePileTest, InvalidationOutsideRecordingRect) {
-  gfx::Rect huge_layer_rect(10000000, 20000000);
+  gfx::Size huge_layer_size(10000000, 20000000);
   gfx::Rect viewport(300000, 400000, 5000, 6000);
 
   // Resize the pile and set up the interest rect.
   Region invalidation;
-  UpdateAndExpandInvalidation(&invalidation, huge_layer_rect, viewport);
+  UpdateAndExpandInvalidation(&invalidation, huge_layer_size, viewport);
 
   // Invalidation inside the recording rect does not need to be expanded.
   invalidation = viewport;
-  UpdateAndExpandInvalidation(&invalidation, huge_layer_rect, viewport);
+  UpdateAndExpandInvalidation(&invalidation, huge_layer_size, viewport);
   EXPECT_EQ(viewport.ToString(), invalidation.ToString());
 
   // Invalidation outside the recording rect should expand to the tiles it
   // covers.
   gfx::Rect recorded_over_tiles =
       pile_->tiling().ExpandRectToTileBounds(pile_->recorded_viewport());
   gfx::Rect invalidation_outside(
       recorded_over_tiles.right(), recorded_over_tiles.y(), 30, 30);
   invalidation = invalidation_outside;
-  UpdateAndExpandInvalidation(&invalidation, huge_layer_rect, viewport);
+  UpdateAndExpandInvalidation(&invalidation, huge_layer_size, viewport);
   gfx::Rect expanded_recorded_viewport =
       pile_->tiling().ExpandRectToTileBounds(pile_->recorded_viewport());
   Region expected_invalidation =
       pile_->tiling().ExpandRectToTileBounds(invalidation_outside);
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
 }
 
 TEST_F(PicturePileTest, ResizePileOutsideInterestRect) {
   // This size chosen to be larger than the interest rect size, which is
   // at least kPixelDistanceToRecord * 2 in each dimension.
   int tile_size = 100000;
-  gfx::Rect base_tiling_rect(5 * tile_size, 5 * tile_size);
-  gfx::Rect grow_down_tiling_rect(5 * tile_size, 7 * tile_size);
-  gfx::Rect grow_right_tiling_rect(7 * tile_size, 5 * tile_size);
-  gfx::Rect grow_both_tiling_rect(7 * tile_size, 7 * tile_size);
+  gfx::Size base_tiling_size(5 * tile_size, 5 * tile_size);
+  gfx::Size grow_down_tiling_size(5 * tile_size, 7 * tile_size);
+  gfx::Size grow_right_tiling_size(7 * tile_size, 5 * tile_size);
+  gfx::Size grow_both_tiling_size(7 * tile_size, 7 * tile_size);
 
   Region invalidation;
   Region expected_invalidation;
 
   pile_->tiling().SetMaxTextureSize(gfx::Size(tile_size, tile_size));
-  SetTilingRect(base_tiling_rect);
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   UpdateAndExpandInvalidation(
-      &invalidation, grow_down_tiling_rect, gfx::Rect(1, 1));
+      &invalidation, grow_down_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings in the bottom row.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(j < 5, it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the old bottom row.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(0, 5),
                                           pile_->tiling().TileBounds(5, 5));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(j < 6, it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   expected_invalidation.Clear();
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_right_tiling_rect, gfx::Rect(1, 1));
+      &invalidation, grow_right_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings in the right column.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(i < 5, it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the old right column.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(5, 0),
                                           pile_->tiling().TileBounds(5, 5));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(i < 6, it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   expected_invalidation.Clear();
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_both_tiling_rect, gfx::Rect(1, 1));
+      &invalidation, grow_both_tiling_size, gfx::Rect(1, 1));
 
   // 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 < pile_->tiling().num_tiles_x(); ++i) {
     for (int j = 0; j < pile_->tiling().num_tiles_y(); ++j) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(i < 5 && j < 5, it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the old right column and the old bottom row.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(5, 0),
                                           pile_->tiling().TileBounds(5, 5));
   expected_invalidation.Union(gfx::UnionRects(
       pile_->tiling().TileBounds(0, 5), pile_->tiling().TileBounds(5, 5)));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect());
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(i < 6 && j < 6, it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   expected_invalidation.Clear();
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 }
 
 TEST_F(PicturePileTest, SmallResizePileOutsideInterestRect) {
   // This size chosen to be larger than the interest rect size, which is
   // at least kPixelDistanceToRecord * 2 in each dimension.
   int tile_size = 100000;
-  gfx::Rect base_tiling_rect(5 * tile_size, 5 * tile_size);
-  gfx::Rect grow_down_tiling_rect(5 * tile_size, 5 * tile_size + 5);
-  gfx::Rect grow_right_tiling_rect(5 * tile_size + 5, 5 * tile_size);
-  gfx::Rect grow_both_tiling_rect(5 * tile_size + 5, 5 * tile_size + 5);
+  gfx::Size base_tiling_size(5 * tile_size, 5 * tile_size);
+  gfx::Size grow_down_tiling_size(5 * tile_size, 5 * tile_size + 5);
+  gfx::Size grow_right_tiling_size(5 * tile_size + 5, 5 * tile_size);
+  gfx::Size grow_both_tiling_size(5 * tile_size + 5, 5 * tile_size + 5);
 
   Region invalidation;
   Region expected_invalidation;
 
   pile_->tiling().SetMaxTextureSize(gfx::Size(tile_size, tile_size));
-  SetTilingRect(base_tiling_rect);
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   UpdateAndExpandInvalidation(
-      &invalidation, grow_down_tiling_rect, gfx::Rect(1, 1));
+      &invalidation, grow_down_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings in the bottom row.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(j < 5, it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the bottom row.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(0, 5),
                                           pile_->tiling().TileBounds(5, 5));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost nothing.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated nothing.
   expected_invalidation.Clear();
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_right_tiling_rect, gfx::Rect(1, 1));
+      &invalidation, grow_right_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings in the right column.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(i < 5, it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the right column.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(5, 0),
                                           pile_->tiling().TileBounds(5, 5));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost nothing.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated nothing.
   expected_invalidation.Clear();
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_both_tiling_rect, gfx::Rect(1, 1));
+      &invalidation, grow_both_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost the recordings in the right column and bottom row.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_EQ(i < 5 && j < 5, it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the right column and the bottom row.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(5, 0),
                                           pile_->tiling().TileBounds(5, 5));
   expected_invalidation.Union(gfx::UnionRects(
       pile_->tiling().TileBounds(0, 5), pile_->tiling().TileBounds(5, 5)));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  UpdateAndExpandInvalidation(&invalidation, base_tiling_size, gfx::Rect(1, 1));
 
   // We should have lost nothing.
   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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated nothing.
   expected_invalidation.Clear();
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 }
 
 TEST_F(PicturePileTest, ResizePileInsideInterestRect) {
   // This size chosen to be small enough that all the rects below fit inside the
   // the interest rect, so they are smaller than kPixelDistanceToRecord in each
   // dimension.
   int tile_size = 100;
-  gfx::Rect base_tiling_rect(5 * tile_size, 5 * tile_size);
-  gfx::Rect grow_down_tiling_rect(5 * tile_size, 7 * tile_size);
-  gfx::Rect grow_right_tiling_rect(7 * tile_size, 5 * tile_size);
-  gfx::Rect grow_both_tiling_rect(7 * tile_size, 7 * tile_size);
+  gfx::Size base_tiling_size(5 * tile_size, 5 * tile_size);
+  gfx::Size grow_down_tiling_size(5 * tile_size, 7 * tile_size);
+  gfx::Size grow_right_tiling_size(7 * tile_size, 5 * tile_size);
+  gfx::Size grow_both_tiling_size(7 * tile_size, 7 * tile_size);
 
   Region invalidation;
   Region expected_invalidation;
 
   pile_->tiling().SetMaxTextureSize(gfx::Size(tile_size, tile_size));
-  SetTilingRect(base_tiling_rect);
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   UpdateAndExpandInvalidation(
-      &invalidation, grow_down_tiling_rect, gfx::Rect(1, 1));
+      &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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the newly exposed pixels on the bottom row of tiles.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(0, 5),
                                           pile_->tiling().TileBounds(5, 5));
-  expected_invalidation.Subtract(base_tiling_rect);
+  expected_invalidation.Subtract(gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_right_tiling_rect, gfx::Rect(1, 1));
+      &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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the newly exposed pixels on the right column of tiles.
   expected_invalidation = gfx::UnionRects(pile_->tiling().TileBounds(5, 0),
                                           pile_->tiling().TileBounds(5, 5));
-  expected_invalidation.Subtract(base_tiling_rect);
+  expected_invalidation.Subtract(gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect(1, 1));
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_both_tiling_rect, gfx::Rect(1, 1));
+      &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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the newly exposed pixels on the bottom row and right column
   // of tiles.
   expected_invalidation =
       UnionRegions(gfx::UnionRects(pile_->tiling().TileBounds(5, 0),
                                    pile_->tiling().TileBounds(5, 5)),
                    gfx::UnionRects(pile_->tiling().TileBounds(0, 5),
                                    pile_->tiling().TileBounds(5, 5)));
-  expected_invalidation.Subtract(base_tiling_rect);
+  expected_invalidation.Subtract(gfx::Rect(base_tiling_size));
   EXPECT_EQ(expected_invalidation.ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
-  UpdateAndExpandInvalidation(&invalidation, base_tiling_rect, gfx::Rect());
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
   invalidation.Clear();
 }
 
 TEST_F(PicturePileTest, SmallResizePileInsideInterestRect) {
   // This size chosen to be small enough that all the rects below fit inside the
   // the interest rect, so they are smaller than kPixelDistanceToRecord in each
   // dimension.
   int tile_size = 100;
-  gfx::Rect base_tiling_rect(5 * tile_size, 5 * tile_size);
-  gfx::Rect grow_down_tiling_rect(5 * tile_size, 5 * tile_size + 5);
-  gfx::Rect grow_right_tiling_rect(5 * tile_size + 5, 5 * tile_size);
-  gfx::Rect grow_both_tiling_rect(5 * tile_size + 5, 5 * tile_size + 5);
+  gfx::Size base_tiling_size(5 * tile_size, 5 * tile_size);
+  gfx::Size grow_down_tiling_size(5 * tile_size, 5 * tile_size + 5);
+  gfx::Size grow_right_tiling_size(5 * tile_size + 5, 5 * tile_size);
+  gfx::Size grow_both_tiling_size(5 * tile_size + 5, 5 * tile_size + 5);
 
   Region invalidation;
   Region expected_invalidation;
 
   pile_->tiling().SetMaxTextureSize(gfx::Size(tile_size, tile_size));
-  SetTilingRect(base_tiling_rect);
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   UpdateAndExpandInvalidation(
-      &invalidation, grow_down_tiling_rect, gfx::Rect(1, 1));
+      &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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the newly exposed pixels.
-  expected_invalidation =
-      SubtractRegions(grow_down_tiling_rect, base_tiling_rect);
+  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_rect, gfx::Rect(1, 1));
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_right_tiling_rect, gfx::Rect(1, 1));
+      &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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the newly exposed pixels.
-  expected_invalidation =
-      SubtractRegions(grow_right_tiling_rect, base_tiling_rect);
+  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_rect, gfx::Rect(1, 1));
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
   invalidation.Clear();
 
   UpdateWholePile();
   UpdateAndExpandInvalidation(
-      &invalidation, grow_both_tiling_rect, gfx::Rect(1, 1));
+      &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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // We invalidated the newly exposed pixels.
-  expected_invalidation =
-      SubtractRegions(grow_both_tiling_rect, base_tiling_rect);
+  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_rect, gfx::Rect());
+  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) {
       TestPicturePile::PictureMapKey key(i, j);
       TestPicturePile::PictureMap& map = pile_->picture_map();
       TestPicturePile::PictureMap::iterator it = map.find(key);
       EXPECT_TRUE(it != map.end() && it->second.GetPicture());
     }
   }
 
   // No invalidation when shrinking.
   EXPECT_EQ(Region().ToString(), invalidation.ToString());
   invalidation.Clear();
 }
 
 }  // namespace
 }  // namespace cc