cc: Remove unused_memory_limit_in_bytes field from GlobalStateThatImpactsTilePriority.

This field is not used by the tile manager as it only affects the
resource pool and the tile manager is no longer responsible for
forwarding these changes to the resource pool.

Also removes inappropriate call to SetResourceUsageLimits in
TileManager::SetGlobalStateForTesting.

R=vmpstr
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266462 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 13 deletions

diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 6c71152..e3abb19 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -217,10 +217,6 @@ class CC_EXPORT TileManager : public RasterizerClient,
     if (state != global_state_) {
       global_state_ = state;
       prioritized_tiles_dirty_ = true;
-      resource_pool_->SetResourceUsageLimits(
-          global_state_.soft_memory_limit_in_bytes,
-          global_state_.unused_memory_limit_in_bytes,
-          global_state_.num_resources_limit);
     }
   }
 
diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
index 9a1642a..bfe50e02 100644
--- a/cc/resources/tile_manager_perftest.cc
+++ b/cc/resources/tile_manager_perftest.cc
@@ -161,7 +161,12 @@ class TileManagerPerfTest : public testing::Test {
         }
       }
 
-      tile_manager_->ManageTiles(GlobalStateForTest());
+      GlobalStateThatImpactsTilePriority global_state(GlobalStateForTest());
+      resource_pool_->SetResourceUsageLimits(
+          global_state.soft_memory_limit_in_bytes,
+          0,
+          global_state.num_resources_limit);
+      tile_manager_->ManageTiles(global_state);
       tile_manager_->UpdateVisibleTiles();
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
@@ -218,11 +223,12 @@ class TileManagerTileIteratorPerfTest : public testing::Test,
     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.unused_memory_limit_in_bytes = state.soft_memory_limit_in_bytes;
     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);
     host_impl_.tile_manager()->SetGlobalStateForTesting(state);
   }
 
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
index fac13d6..8edecd5 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -65,11 +65,13 @@ class TileManagerTest : public testing::TestWithParam<bool>,
       state.num_resources_limit = max_tiles_;
     }
     state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2;
-    state.unused_memory_limit_in_bytes = state.soft_memory_limit_in_bytes;
     state.memory_limit_policy = memory_limit_policy_;
     state.tree_priority = tree_priority;
 
     global_state_ = state;
+    resource_pool_->SetResourceUsageLimits(state.soft_memory_limit_in_bytes,
+                                           state.soft_memory_limit_in_bytes,
+                                           state.num_resources_limit);
     tile_manager_->SetGlobalStateForTesting(state);
   }
 
@@ -657,11 +659,14 @@ class TileManagerTileIteratorTest : public testing::Test,
     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.unused_memory_limit_in_bytes = state.soft_memory_limit_in_bytes;
     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,
+        state.soft_memory_limit_in_bytes,
+        state.num_resources_limit);
     host_impl_.tile_manager()->SetGlobalStateForTesting(state);
   }
 
diff --git a/cc/resources/tile_priority.cc b/cc/resources/tile_priority.cc
index 9e81d6c..3bf2968 100644
--- a/cc/resources/tile_priority.cc
+++ b/cc/resources/tile_priority.cc
@@ -106,8 +106,6 @@ scoped_ptr<base::Value> GlobalStateThatImpactsTilePriority::AsValue() const {
              TileMemoryLimitPolicyAsValue(memory_limit_policy).release());
   state->SetInteger("soft_memory_limit_in_bytes", soft_memory_limit_in_bytes);
   state->SetInteger("hard_memory_limit_in_bytes", hard_memory_limit_in_bytes);
-  state->SetInteger("unused_memory_limit_in_bytes",
-                    unused_memory_limit_in_bytes);
   state->SetInteger("num_resources_limit", num_resources_limit);
   state->Set("tree_priority", TreePriorityAsValue(tree_priority).release());
   return state.PassAs<base::Value>();
diff --git a/cc/resources/tile_priority.h b/cc/resources/tile_priority.h
index 31b8e5d..f8ac9c6 100644
--- a/cc/resources/tile_priority.h
+++ b/cc/resources/tile_priority.h
@@ -146,7 +146,6 @@ class GlobalStateThatImpactsTilePriority {
       : memory_limit_policy(ALLOW_NOTHING),
         soft_memory_limit_in_bytes(0),
         hard_memory_limit_in_bytes(0),
-        unused_memory_limit_in_bytes(0),
         num_resources_limit(0),
         tree_priority(SAME_PRIORITY_FOR_BOTH_TREES) {}
 
@@ -154,7 +153,6 @@ class GlobalStateThatImpactsTilePriority {
 
   size_t soft_memory_limit_in_bytes;
   size_t hard_memory_limit_in_bytes;
-  size_t unused_memory_limit_in_bytes;
   size_t num_resources_limit;
 
   TreePriority tree_priority;
@@ -163,7 +161,6 @@ class GlobalStateThatImpactsTilePriority {
     return memory_limit_policy == other.memory_limit_policy &&
            soft_memory_limit_in_bytes == other.soft_memory_limit_in_bytes &&
            hard_memory_limit_in_bytes == other.hard_memory_limit_in_bytes &&
-           unused_memory_limit_in_bytes == other.unused_memory_limit_in_bytes &&
            num_resources_limit == other.num_resources_limit &&
            tree_priority == other.tree_priority;
   }