Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: cc/resources/tile_manager.h

Issue 366113002: cc: Do not cleanup tiles with raster tasks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reset priority on correct tree. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 FreeResourcesAndCleanUpReleasedTilesForTesting() {
231 FreeResourcesForReleasedTiles();
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 typedef base::hash_map<uint32_t, scoped_refptr<ImageDecodeTask> > 321 typedef base::hash_map<uint32_t, scoped_refptr<ImageDecodeTask> >
318 PixelRefTaskMap; 322 PixelRefTaskMap;
319 typedef base::hash_map<int, PixelRefTaskMap> LayerPixelRefTaskMap; 323 typedef base::hash_map<int, PixelRefTaskMap> LayerPixelRefTaskMap;
320 LayerPixelRefTaskMap image_decode_tasks_; 324 LayerPixelRefTaskMap image_decode_tasks_;
321 325
322 typedef base::hash_map<int, int> LayerCountMap; 326 typedef base::hash_map<int, int> LayerCountMap;
323 LayerCountMap used_layer_counts_; 327 LayerCountMap used_layer_counts_;
324 328
325 RasterTaskCompletionStats update_visible_tiles_stats_; 329 RasterTaskCompletionStats update_visible_tiles_stats_;
326 330
331 // TODO(sohanjg): Use ScopedVector.
vmpstr 2014/07/25 16:29:25 Scoped vector would keep the tiles alive (thus pre
vmpstr 2014/07/25 16:43:43 Ignore this comment, I thought this was for priori
reveman 2014/07/25 17:00:55 This can't be a TODO. You're introducing a memory
sohanjg 2014/07/26 09:36:01 Done. yea.right!
327 std::vector<Tile*> released_tiles_; 332 std::vector<Tile*> released_tiles_;
328 333
329 ResourceFormat resource_format_; 334 ResourceFormat resource_format_;
330 335
331 // Queue used when scheduling raster tasks. 336 // Queue used when scheduling raster tasks.
332 RasterTaskQueue raster_queue_; 337 RasterTaskQueue raster_queue_;
333 338
334 std::vector<scoped_refptr<RasterTask> > orphan_raster_tasks_; 339 std::vector<scoped_refptr<RasterTask> > orphan_raster_tasks_;
335 340
336 UniqueNotifier ready_to_activate_check_notifier_; 341 UniqueNotifier ready_to_activate_check_notifier_;
337 342
338 DISALLOW_COPY_AND_ASSIGN(TileManager); 343 DISALLOW_COPY_AND_ASSIGN(TileManager);
339 }; 344 };
340 345
341 } // namespace cc 346 } // namespace cc
342 347
343 #endif // CC_RESOURCES_TILE_MANAGER_H_ 348 #endif // CC_RESOURCES_TILE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698