| Index: cc/resources/tile_manager.h
|
| diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
|
| index 51229526c89aefa6bfe7a0b4740676cbbc2be3a0..9e376a38522c9b71f7b621b7ccdc6cf3eaf93e9d 100644
|
| --- a/cc/resources/tile_manager.h
|
| +++ b/cc/resources/tile_manager.h
|
| @@ -106,11 +106,13 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
|
|
|
| void SetGlobalStateForTesting(
|
| const GlobalStateThatImpactsTilePriority& state) {
|
| + // Soft limit is used for resource pool such that
|
| + // memory returns to soft limit after going over.
|
| if (state != global_state_) {
|
| global_state_ = state;
|
| prioritized_tiles_dirty_ = true;
|
| resource_pool_->SetResourceUsageLimits(
|
| - global_state_.memory_limit_in_bytes,
|
| + global_state_.soft_memory_limit_in_bytes,
|
| global_state_.unused_memory_limit_in_bytes,
|
| global_state_.num_resources_limit);
|
| }
|
|
|