 Chromium Code Reviews
 Chromium Code Reviews Issue 366113002:
  cc: Do not cleanup tiles with raster tasks.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 366113002:
  cc: Do not cleanup tiles with raster tasks.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CC_RESOURCES_TILE_MANAGER_H_ | 5 #ifndef CC_RESOURCES_TILE_MANAGER_H_ | 
| 6 #define CC_RESOURCES_TILE_MANAGER_H_ | 6 #define CC_RESOURCES_TILE_MANAGER_H_ | 
| 7 | 7 | 
| 8 #include <deque> | 8 #include <deque> | 
| 9 #include <queue> | 9 #include <queue> | 
| 10 #include <set> | 10 #include <set> | 
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 // Soft limit is used for resource pool such that | 220 // Soft limit is used for resource pool such that | 
| 221 // memory returns to soft limit after going over. | 221 // memory returns to soft limit after going over. | 
| 222 if (state != global_state_) { | 222 if (state != global_state_) { | 
| 223 global_state_ = state; | 223 global_state_ = state; | 
| 224 prioritized_tiles_dirty_ = true; | 224 prioritized_tiles_dirty_ = true; | 
| 225 } | 225 } | 
| 226 } | 226 } | 
| 227 | 227 | 
| 228 void SetRasterizerForTesting(Rasterizer* rasterizer); | 228 void SetRasterizerForTesting(Rasterizer* rasterizer); | 
| 229 | 229 | 
| 230 void CleanUpReleasedTilesForTesting() { CleanUpReleasedTiles(); } | 230 void CleanUpReleasedTilesForTesting() { | 
| 231 FreeResourcesForReleasedTiles(); | |
| 
reveman
2014/07/10 16:21:56
please move this to a separate function or change
 
sohanjg
2014/07/11 15:14:12
Done.
 | |
| 232 CleanUpReleasedTiles(); | |
| 233 } | |
| 231 | 234 | 
| 232 protected: | 235 protected: | 
| 233 TileManager(TileManagerClient* client, | 236 TileManager(TileManagerClient* client, | 
| 234 base::SequencedTaskRunner* task_runner, | 237 base::SequencedTaskRunner* task_runner, | 
| 235 ResourcePool* resource_pool, | 238 ResourcePool* resource_pool, | 
| 236 Rasterizer* rasterizer, | 239 Rasterizer* rasterizer, | 
| 237 RenderingStatsInstrumentation* rendering_stats_instrumentation); | 240 RenderingStatsInstrumentation* rendering_stats_instrumentation); | 
| 238 | 241 | 
| 239 // Methods called by Tile | 242 // Methods called by Tile | 
| 240 friend class Tile; | 243 friend class Tile; | 
| 241 void DidChangeTilePriority(Tile* tile); | 244 void DidChangeTilePriority(Tile* tile); | 
| 242 | 245 | 
| 246 void FreeResourcesForReleasedTiles(); | |
| 243 void CleanUpReleasedTiles(); | 247 void CleanUpReleasedTiles(); | 
| 244 | 248 | 
| 245 // Overriden from RefCountedManager<Tile>: | 249 // Overriden from RefCountedManager<Tile>: | 
| 246 virtual void Release(Tile* tile) OVERRIDE; | 250 virtual void Release(Tile* tile) OVERRIDE; | 
| 247 | 251 | 
| 248 // Overriden from RasterizerClient: | 252 // Overriden from RasterizerClient: | 
| 249 virtual bool ShouldForceTasksRequiredForActivationToComplete() const OVERRIDE; | 253 virtual bool ShouldForceTasksRequiredForActivationToComplete() const OVERRIDE; | 
| 250 virtual void DidFinishRunningTasks() OVERRIDE; | 254 virtual void DidFinishRunningTasks() OVERRIDE; | 
| 251 virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE; | 255 virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE; | 
| 252 | 256 | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 324 | 328 | 
| 325 RasterTaskCompletionStats update_visible_tiles_stats_; | 329 RasterTaskCompletionStats update_visible_tiles_stats_; | 
| 326 | 330 | 
| 327 std::vector<Tile*> released_tiles_; | 331 std::vector<Tile*> released_tiles_; | 
| 328 | 332 | 
| 329 ResourceFormat resource_format_; | 333 ResourceFormat resource_format_; | 
| 330 | 334 | 
| 331 // Queue used when scheduling raster tasks. | 335 // Queue used when scheduling raster tasks. | 
| 332 RasterTaskQueue raster_queue_; | 336 RasterTaskQueue raster_queue_; | 
| 333 | 337 | 
| 334 std::vector<scoped_refptr<RasterTask> > orphan_raster_tasks_; | |
| 335 | |
| 336 UniqueNotifier ready_to_activate_check_notifier_; | 338 UniqueNotifier ready_to_activate_check_notifier_; | 
| 337 | 339 | 
| 338 DISALLOW_COPY_AND_ASSIGN(TileManager); | 340 DISALLOW_COPY_AND_ASSIGN(TileManager); | 
| 339 }; | 341 }; | 
| 340 | 342 | 
| 341 } // namespace cc | 343 } // namespace cc | 
| 342 | 344 | 
| 343 #endif // CC_RESOURCES_TILE_MANAGER_H_ | 345 #endif // CC_RESOURCES_TILE_MANAGER_H_ | 
| OLD | NEW |