Revert "cc: Make tiling interest rect calc based on viewport."

cc/tiles/picture_layer_tiling_unittest.cc

Index: cc/tiles/picture_layer_tiling_unittest.cc
diff --git a/cc/tiles/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc
index 8eb2492047eb46000b7174a28af8e27fb2023793..1c8a3978eb2d25e6542119937bcdf4abfdfbc456 100644
--- a/cc/tiles/picture_layer_tiling_unittest.cc
+++ b/cc/tiles/picture_layer_tiling_unittest.cc
@@ -49,7 +49,7 @@ class TestablePictureLayerTiling : public PictureLayerTiling {
       const LayerTreeSettings& settings) {
     return make_scoped_ptr(new TestablePictureLayerTiling(
         tree, contents_scale, raster_source, client,
-        settings.tiling_interest_area_viewport_multiplier,
+        settings.max_tiles_for_interest_area,
         settings.skewport_target_time_in_seconds,
         settings.skewport_extrapolation_limit_in_content_pixels));
   }
@@ -64,14 +64,14 @@ class TestablePictureLayerTiling : public PictureLayerTiling {
                              float contents_scale,
                              scoped_refptr<RasterSource> raster_source,
                              PictureLayerTilingClient* client,
-                             float tiling_interest_area_viewport_multiplier,
+                             size_t max_tiles_for_interest_area,
                              float skewport_target_time,
                              int skewport_extrapolation_limit)
       : PictureLayerTiling(tree,
                            contents_scale,
                            raster_source,
                            client,
-                           tiling_interest_area_viewport_multiplier,
+                           max_tiles_for_interest_area,
                            skewport_target_time,
                            skewport_extrapolation_limit) {}
 };
@@ -550,6 +550,7 @@ TEST(PictureLayerTilingTest, SkewportLimits) {
 
   client.SetTileSize(gfx::Size(100, 100));
   LayerTreeSettings settings;
+  settings.max_tiles_for_interest_area = 10000;
   settings.skewport_extrapolation_limit_in_content_pixels = 75;
 
   scoped_refptr<FakePicturePileImpl> pile =
@@ -792,7 +793,7 @@ TEST(PictureLayerTilingTest, ViewportDistanceWithScale) {
 
   client.SetTileSize(gfx::Size(10, 10));
   LayerTreeSettings settings;
-  settings.tiling_interest_area_viewport_multiplier = 10000;
+  settings.max_tiles_for_interest_area = 10000;
 
   // Tiling at 0.25 scale: this should create 47x47 tiles of size 10x10.
   // The reason is that each tile has a one pixel border, so tile at (1, 2)
@@ -1292,7 +1293,7 @@ TEST_F(PictureLayerTilingIteratorTest,
   gfx::Size layer_bounds(10000, 10000);
   client_.SetTileSize(gfx::Size(100, 100));
   LayerTreeSettings settings;
-  settings.tiling_interest_area_viewport_multiplier = 1;
+  settings.max_tiles_for_interest_area = 1;
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds);
@@ -1749,7 +1750,7 @@ TEST(ComputeTilePriorityRectsTest, BasicMotion) {
 
   client.SetTileSize(gfx::Size(100, 100));
   LayerTreeSettings settings;
-  settings.tiling_interest_area_viewport_multiplier = 10000;
+  settings.max_tiles_for_interest_area = 10000;
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(
@@ -1879,6 +1880,7 @@ TEST(PictureLayerTilingTest, RecycledTilesCleared) {
 
   active_client.SetTileSize(gfx::Size(100, 100));
   LayerTreeSettings settings;
+  settings.max_tiles_for_interest_area = 10;
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(
@@ -1946,6 +1948,7 @@ TEST(PictureLayerTilingTest, RecycledTilesClearedOnReset) {
   recycle_client.set_twin_tiling(active_tiling.get());
 
   LayerTreeSettings settings;
+  settings.max_tiles_for_interest_area = 10;
 
   pile = FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(
       gfx::Size(100, 100));