cc: Remove tile and scale specific code from raster source

Fix a TODO I added a while back.  Instead of calling SetMinContentsScale
and SetTileGridSize directly, pass these as parameters to constructor of the
PicturePile.

Committed: https://crrev.com/6d1f2981f3204852a9189d0b6e7ad0b18659d68d
Cr-Commit-Position: refs/heads/master@{#309867}

Review URL: https://codereview.chromium.org/811953005

Cr-Commit-Position: refs/heads/master@{#313183}

2 files changed, 14 insertions, 9 deletions

diff --git a/cc/test/fake_picture_pile.h b/cc/test/fake_picture_pile.h
index 4a7b65b..55b4c36 100644
--- a/cc/test/fake_picture_pile.h
+++ b/cc/test/fake_picture_pile.h
@@ -19,7 +19,9 @@ class FakePicturePile : public PicturePile {
   using PictureMapKey = PicturePile::PictureMapKey;
   using PictureMap = PicturePile::PictureMap;
 
-  FakePicturePile() : playback_allowed_event_(nullptr) {}
+  FakePicturePile(float min_contents_scale, const gfx::Size& tile_grid_size)
+      : PicturePile(min_contents_scale, tile_grid_size),
+        playback_allowed_event_(nullptr) {}
   ~FakePicturePile() override {}
 
   // PicturePile overrides.
diff --git a/cc/test/fake_picture_pile_impl.cc b/cc/test/fake_picture_pile_impl.cc
index c400298..420b5d6 100644
--- a/cc/test/fake_picture_pile_impl.cc
+++ b/cc/test/fake_picture_pile_impl.cc
@@ -32,10 +32,11 @@ FakePicturePileImpl::~FakePicturePileImpl() {}
 scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFilledPile(
     const gfx::Size& tile_size,
     const gfx::Size& layer_bounds) {
-  FakePicturePile pile;
+  FakePicturePile pile(ImplSidePaintingSettings().minimum_contents_scale,
+                       ImplSidePaintingSettings().default_tile_grid_size);
+  pile.tiling().SetBorderTexels(0);
   pile.tiling().SetTilingSize(layer_bounds);
   pile.tiling().SetMaxTextureSize(tile_size);
-  pile.SetTileGridSize(ImplSidePaintingSettings().default_tile_grid_size);
   pile.SetRecordedViewport(gfx::Rect(layer_bounds));
   pile.SetHasAnyRecordings(true);
 
@@ -51,10 +52,11 @@ scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFilledPile(
 scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateEmptyPile(
     const gfx::Size& tile_size,
     const gfx::Size& layer_bounds) {
-  FakePicturePile pile;
+  FakePicturePile pile(ImplSidePaintingSettings().minimum_contents_scale,
+                       ImplSidePaintingSettings().default_tile_grid_size);
+  pile.tiling().SetBorderTexels(0);
   pile.tiling().SetTilingSize(layer_bounds);
   pile.tiling().SetMaxTextureSize(tile_size);
-  pile.SetTileGridSize(ImplSidePaintingSettings().default_tile_grid_size);
   pile.SetRecordedViewport(gfx::Rect());
   pile.SetHasAnyRecordings(false);
   return make_scoped_refptr(new FakePicturePileImpl(&pile, nullptr));
@@ -64,10 +66,11 @@ scoped_refptr<FakePicturePileImpl>
 FakePicturePileImpl::CreateEmptyPileThatThinksItHasRecordings(
     const gfx::Size& tile_size,
     const gfx::Size& layer_bounds) {
-  FakePicturePile pile;
+  FakePicturePile pile(ImplSidePaintingSettings().minimum_contents_scale,
+                       ImplSidePaintingSettings().default_tile_grid_size);
+  pile.tiling().SetBorderTexels(0);
   pile.tiling().SetTilingSize(layer_bounds);
   pile.tiling().SetMaxTextureSize(tile_size);
-  pile.SetTileGridSize(ImplSidePaintingSettings().default_tile_grid_size);
   // This simulates a false positive for this flag.
   pile.SetRecordedViewport(gfx::Rect());
   pile.SetHasAnyRecordings(true);
@@ -76,12 +79,12 @@ FakePicturePileImpl::CreateEmptyPileThatThinksItHasRecordings(
 
 scoped_refptr<FakePicturePileImpl>
 FakePicturePileImpl::CreateInfiniteFilledPile() {
-  FakePicturePile pile;
   gfx::Size size(std::numeric_limits<int>::max(),
                  std::numeric_limits<int>::max());
+  FakePicturePile pile(ImplSidePaintingSettings().minimum_contents_scale, size);
+  pile.tiling().SetBorderTexels(0);
   pile.tiling().SetTilingSize(size);
   pile.tiling().SetMaxTextureSize(size);
-  pile.SetTileGridSize(size);
   pile.SetRecordedViewport(gfx::Rect(size));
   pile.SetHasAnyRecordings(true);