cc: Make tiling interest rect calc based on viewport.

cc/resources/tile_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/thread_task_runner_handle.h"
 #include "cc/resources/eviction_tile_priority_queue.h"
 #include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
@@ skipping 757 matching lines @@
       }
     }
 
     last_tile = tile;
     ++tile_count;
     smoothness_tiles.insert(tile);
     queue->Pop();
   }
 
   // Ensure that the distance is decreasing many more times than increasing.
-  EXPECT_EQ(3, distance_increasing);
-  EXPECT_EQ(17, distance_decreasing);
+  EXPECT_EQ(0, distance_increasing);
+  EXPECT_EQ(8, distance_decreasing);

[vmpstr, 2015/05/06 17:57:29]

I'd prefer if these numbers stayed the same, can you adjust the multiplier so
that the same amount of tiles is created instead?

[sohanjg, 2015/05/07 14:42:10]

Hmm..we cant modify the LayerTreeSettings from this test, and we are not
explicitly creating PLTS, to pass the multiplier :/

any suggestions ?

[vmpstr, 2015/05/07 17:21:38]

host_impl that is constructed for this test takes a LayerTreeSettings. Does
setting the multiplier to be high for all tests here work?

[sohanjg, 2015/05/08 13:26:09]

Done.

Works fine, thanks  :)

   EXPECT_EQ(tile_count, smoothness_tiles.size());
   EXPECT_EQ(all_tiles, smoothness_tiles);
 
   std::set<Tile*> new_content_tiles;
   last_tile = NULL;
   // Again, we expect to get increasing combined priority_bin.
   queue = host_impl_.BuildEvictionQueue(NEW_CONTENT_TAKES_PRIORITY);
   distance_decreasing = 0;
   distance_increasing = 0;
   while (!queue->IsEmpty()) {
@@ skipping 18 matching lines @@
           ++distance_increasing;
       }
     }
 
     last_tile = tile;
     new_content_tiles.insert(tile);
     queue->Pop();
   }
 
   // Ensure that the distance is decreasing many more times than increasing.
-  EXPECT_EQ(3, distance_increasing);
-  EXPECT_EQ(17, distance_decreasing);
+  EXPECT_EQ(0, distance_increasing);
+  EXPECT_EQ(8, distance_decreasing);

[vmpstr, 2015/05/06 17:57:29]

Same here.

[sohanjg, 2015/05/07 14:42:10]

Acknowledged.

[sohanjg, 2015/05/08 13:26:09]

Done.

   EXPECT_EQ(tile_count, new_content_tiles.size());
   EXPECT_EQ(all_tiles, new_content_tiles);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest,
        EvictionTilePriorityQueueWithOcclusion) {
   base::TimeTicks time_ticks;
   time_ticks += base::TimeDelta::FromMilliseconds(1);
   host_impl_.SetCurrentBeginFrameArgs(
       CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
@@ skipping 339 matching lines @@
 
   gfx::Rect viewport(50, 50, 500, 500);
   gfx::Size layer_bounds(1600, 1600);
 
   float inset = PictureLayerTiling::CalculateSoonBorderDistance(viewport, 1.0f);
   gfx::Rect soon_rect = viewport;
   soon_rect.Inset(-inset, -inset);
 
   client.SetTileSize(gfx::Size(30, 30));
   LayerTreeSettings settings;
-  settings.max_tiles_for_interest_area = 10000;
+  settings.tiling_interest_area_viewport_multiplier = 36;

[vmpstr, 2015/05/06 17:57:29]

These numbers seem pretty random, why 36? Before it was 10000 to say
"everything" basically, but 36 seems awfully specific.

[sohanjg, 2015/05/07 14:42:10]

Done.

I tried to keep the interest rect same as before in the test.
It was 10000 X 30 X 30, viewport here is 500 X 500, so i kept it 36 to be same
as before. But, 10000 should pass too, i'll change it.

 
   scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create(
-      ACTIVE_TREE, &client, settings.max_tiles_for_interest_area,
+      ACTIVE_TREE, &client, settings.tiling_interest_area_viewport_multiplier,
       settings.skewport_target_time_in_seconds,
       settings.skewport_extrapolation_limit_in_content_pixels);
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds);
   PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, pile);
   tiling->set_resolution(HIGH_RESOLUTION);
 
   tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
   std::vector<Tile*> all_tiles = tiling->AllTilesForTesting();
@@ skipping 86 matching lines @@
 TEST_F(TileManagerTilePriorityQueueTest,
        RasterTilePriorityQueueMovingViewport) {
   FakePictureLayerTilingClient client;
 
   gfx::Rect viewport(50, 0, 100, 100);
   gfx::Rect moved_viewport(50, 0, 100, 500);
   gfx::Size layer_bounds(1000, 1000);
 
   client.SetTileSize(gfx::Size(30, 30));
   LayerTreeSettings settings;
-  settings.max_tiles_for_interest_area = 10000;
+  settings.tiling_interest_area_viewport_multiplier = 180;
 
   scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create(
-      ACTIVE_TREE, &client, settings.max_tiles_for_interest_area,
+      ACTIVE_TREE, &client, settings.tiling_interest_area_viewport_multiplier,
       settings.skewport_target_time_in_seconds,
       settings.skewport_extrapolation_limit_in_content_pixels);
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds);
   PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, pile);
   tiling->set_resolution(HIGH_RESOLUTION);
 
   tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
   tiling_set->UpdateTilePriorities(moved_viewport, 1.0f, 2.0, Occlusion(),
@@ skipping 113 matching lines @@
                                                   RGBA_8888);
 
   host_impl_.tile_manager()->CheckIfMoreTilesNeedToBePreparedForTesting();
   EXPECT_FALSE(host_impl_.is_likely_to_require_a_draw());
 
   host_impl_.resource_pool()->ReleaseResource(resource.Pass());
 }
 
 }  // namespace
 }  // namespace cc