| Index: cc/resources/tile_manager_perftest.cc
|
| diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
|
| index ba130bfb6f409eff99c443efe1828c202a57b184..c7a34788edbef7c39d131e82a889d2d30b0a9144 100644
|
| --- a/cc/resources/tile_manager_perftest.cc
|
| +++ b/cc/resources/tile_manager_perftest.cc
|
| @@ -85,7 +85,6 @@ class TileManagerPerfTest : public testing::Test {
|
| public:
|
| TileManagerPerfTest()
|
| : memory_limit_policy_(ALLOW_ANYTHING),
|
| - max_tiles_(10000),
|
| id_(7),
|
| proxy_(base::MessageLoopProxy::current()),
|
| host_impl_(ImplSidePaintingSettings(10000),
|
| @@ -100,14 +99,13 @@ class TileManagerPerfTest : public testing::Test {
|
| gfx::Size tile_size(256, 256);
|
|
|
| state.soft_memory_limit_in_bytes = 100 * 1000 * 1000;
|
| - state.num_resources_limit = max_tiles_;
|
| state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2;
|
| state.memory_limit_policy = memory_limit_policy_;
|
| state.tree_priority = tree_priority;
|
|
|
| global_state_ = state;
|
| host_impl_.resource_pool()->SetResourceUsageLimits(
|
| - state.soft_memory_limit_in_bytes, 0, state.num_resources_limit);
|
| + state.soft_memory_limit_in_bytes, 0);
|
| host_impl_.tile_manager()->SetGlobalStateForTesting(state);
|
| }
|
|
|
| @@ -387,7 +385,6 @@ class TileManagerPerfTest : public testing::Test {
|
| 10000u * 4u *
|
| static_cast<size_t>(tile_size.width() * tile_size.height());
|
| state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes;
|
| - state.num_resources_limit = 10000;
|
| state.memory_limit_policy = ALLOW_ANYTHING;
|
| state.tree_priority = SMOOTHNESS_TAKES_PRIORITY;
|
| return state;
|
| @@ -425,7 +422,6 @@ class TileManagerPerfTest : public testing::Test {
|
|
|
| TestSharedBitmapManager shared_bitmap_manager_;
|
| TileMemoryLimitPolicy memory_limit_policy_;
|
| - int max_tiles_;
|
| int id_;
|
| FakeImplProxy proxy_;
|
| FakeLayerTreeHostImpl host_impl_;
|
|
|