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 #include "cc/resources/tile_manager.h" | 5 #include "cc/resources/tile_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 base::Bind(&TileManager::CheckIfReadyToActivate, | 382 base::Bind(&TileManager::CheckIfReadyToActivate, |
383 base::Unretained(this))) { | 383 base::Unretained(this))) { |
384 rasterizer_->SetClient(this); | 384 rasterizer_->SetClient(this); |
385 } | 385 } |
386 | 386 |
387 TileManager::~TileManager() { | 387 TileManager::~TileManager() { |
388 // Reset global state and manage. This should cause | 388 // Reset global state and manage. This should cause |
389 // our memory usage to drop to zero. | 389 // our memory usage to drop to zero. |
390 global_state_ = GlobalStateThatImpactsTilePriority(); | 390 global_state_ = GlobalStateThatImpactsTilePriority(); |
391 | 391 |
392 CleanUpReleasedTiles(); | |
393 DCHECK_EQ(0u, tiles_.size()); | |
394 | |
395 RasterTaskQueue empty; | 392 RasterTaskQueue empty; |
396 rasterizer_->ScheduleTasks(&empty); | 393 rasterizer_->ScheduleTasks(&empty); |
397 orphan_raster_tasks_.clear(); | |
398 | 394 |
399 // This should finish all pending tasks and release any uninitialized | 395 // This should finish all pending tasks and release any uninitialized |
400 // resources. | 396 // resources. |
401 rasterizer_->Shutdown(); | 397 rasterizer_->Shutdown(); |
402 rasterizer_->CheckForCompletedTasks(); | 398 rasterizer_->CheckForCompletedTasks(); |
403 | 399 |
400 FreeResourcesForReleasedTiles(); | |
401 CleanUpReleasedTiles(); | |
402 DCHECK_EQ(0u, tiles_.size()); | |
403 | |
404 DCHECK_EQ(0u, bytes_releasable_); | 404 DCHECK_EQ(0u, bytes_releasable_); |
405 DCHECK_EQ(0u, resources_releasable_); | 405 DCHECK_EQ(0u, resources_releasable_); |
406 } | 406 } |
407 | 407 |
408 void TileManager::Release(Tile* tile) { | 408 void TileManager::Release(Tile* tile) { |
409 prioritized_tiles_dirty_ = true; | 409 prioritized_tiles_dirty_ = true; |
410 released_tiles_.push_back(tile); | 410 released_tiles_.push_back(tile); |
411 } | 411 } |
412 | 412 |
413 void TileManager::DidChangeTilePriority(Tile* tile) { | 413 void TileManager::DidChangeTilePriority(Tile* tile) { |
414 prioritized_tiles_dirty_ = true; | 414 prioritized_tiles_dirty_ = true; |
415 } | 415 } |
416 | 416 |
417 bool TileManager::ShouldForceTasksRequiredForActivationToComplete() const { | 417 bool TileManager::ShouldForceTasksRequiredForActivationToComplete() const { |
418 return global_state_.tree_priority != SMOOTHNESS_TAKES_PRIORITY; | 418 return global_state_.tree_priority != SMOOTHNESS_TAKES_PRIORITY; |
419 } | 419 } |
420 | 420 |
421 void TileManager::CleanUpReleasedTiles() { | 421 void TileManager::FreeResourcesForReleasedTiles() { |
422 for (std::vector<Tile*>::iterator it = released_tiles_.begin(); | 422 for (std::vector<Tile*>::iterator it = released_tiles_.begin(); |
423 it != released_tiles_.end(); | 423 it != released_tiles_.end(); |
424 ++it) { | 424 ++it) { |
425 Tile* tile = *it; | 425 Tile* tile = *it; |
426 ManagedTileState& mts = tile->managed_state(); | 426 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) |
427 FreeResourceForTile(tile, static_cast<RasterMode>(mode)); | |
428 } | |
429 } | |
427 | 430 |
428 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) { | 431 void TileManager::CleanUpReleasedTiles() { |
429 FreeResourceForTile(tile, static_cast<RasterMode>(mode)); | 432 std::vector<Tile*>::iterator it = released_tiles_.begin(); |
430 orphan_raster_tasks_.push_back(mts.tile_versions[mode].raster_task_); | 433 while (it != released_tiles_.end()) { |
434 Tile* tile = *it; | |
435 | |
436 if (TileHasRasterTask(tile)) { | |
437 ++it; | |
438 continue; | |
431 } | 439 } |
432 | 440 |
441 DCHECK(!tile->HasResources()); | |
433 DCHECK(tiles_.find(tile->id()) != tiles_.end()); | 442 DCHECK(tiles_.find(tile->id()) != tiles_.end()); |
434 tiles_.erase(tile->id()); | 443 tiles_.erase(tile->id()); |
435 | 444 |
436 LayerCountMap::iterator layer_it = | 445 LayerCountMap::iterator layer_it = |
437 used_layer_counts_.find(tile->layer_id()); | 446 used_layer_counts_.find(tile->layer_id()); |
438 DCHECK_GT(layer_it->second, 0); | 447 DCHECK_GT(layer_it->second, 0); |
439 if (--layer_it->second == 0) { | 448 if (--layer_it->second == 0) { |
440 used_layer_counts_.erase(layer_it); | 449 used_layer_counts_.erase(layer_it); |
441 image_decode_tasks_.erase(tile->layer_id()); | 450 image_decode_tasks_.erase(tile->layer_id()); |
442 } | 451 } |
443 | 452 |
444 delete tile; | 453 delete tile; |
454 it = released_tiles_.erase(it); | |
445 } | 455 } |
446 | |
447 released_tiles_.clear(); | |
448 } | 456 } |
449 | 457 |
450 void TileManager::UpdatePrioritizedTileSetIfNeeded() { | 458 void TileManager::UpdatePrioritizedTileSetIfNeeded() { |
451 if (!prioritized_tiles_dirty_) | 459 if (!prioritized_tiles_dirty_) |
452 return; | 460 return; |
453 | 461 |
462 FreeResourcesForReleasedTiles(); | |
454 CleanUpReleasedTiles(); | 463 CleanUpReleasedTiles(); |
reveman
2014/07/15 15:28:31
Is it enough to clean up released tiles here? What
sohanjg
2014/07/16 13:01:34
It sounds reasonable...1 question wont we be able
reveman
2014/07/16 16:49:02
That's not good enough as the memory limit might r
sohanjg
2014/07/16 17:47:59
OK, right.
| |
455 | 464 |
456 prioritized_tiles_.Clear(); | 465 prioritized_tiles_.Clear(); |
457 GetTilesWithAssignedBins(&prioritized_tiles_); | 466 GetTilesWithAssignedBins(&prioritized_tiles_); |
458 prioritized_tiles_dirty_ = false; | 467 prioritized_tiles_dirty_ = false; |
459 } | 468 } |
460 | 469 |
461 void TileManager::DidFinishRunningTasks() { | 470 void TileManager::DidFinishRunningTasks() { |
462 TRACE_EVENT0("cc", "TileManager::DidFinishRunningTasks"); | 471 TRACE_EVENT0("cc", "TileManager::DidFinishRunningTasks"); |
463 | 472 |
464 bool memory_usage_above_limit = resource_pool_->total_memory_usage_bytes() > | 473 bool memory_usage_above_limit = resource_pool_->total_memory_usage_bytes() > |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
963 | 972 |
964 // We must reduce the amount of unused resoruces before calling | 973 // We must reduce the amount of unused resoruces before calling |
965 // ScheduleTasks to prevent usage from rising above limits. | 974 // ScheduleTasks to prevent usage from rising above limits. |
966 resource_pool_->ReduceResourceUsage(); | 975 resource_pool_->ReduceResourceUsage(); |
967 | 976 |
968 // Schedule running of |raster_tasks_|. This replaces any previously | 977 // Schedule running of |raster_tasks_|. This replaces any previously |
969 // scheduled tasks and effectively cancels all tasks not present | 978 // scheduled tasks and effectively cancels all tasks not present |
970 // in |raster_tasks_|. | 979 // in |raster_tasks_|. |
971 rasterizer_->ScheduleTasks(&raster_queue_); | 980 rasterizer_->ScheduleTasks(&raster_queue_); |
972 | 981 |
973 // It's now safe to clean up orphan tasks as raster worker pool is not | |
974 // allowed to keep around unreferenced raster tasks after ScheduleTasks() has | |
975 // been called. | |
976 orphan_raster_tasks_.clear(); | |
977 | |
978 did_check_for_completed_tasks_since_last_schedule_tasks_ = false; | 982 did_check_for_completed_tasks_since_last_schedule_tasks_ = false; |
979 } | 983 } |
980 | 984 |
981 scoped_refptr<ImageDecodeTask> TileManager::CreateImageDecodeTask( | 985 scoped_refptr<ImageDecodeTask> TileManager::CreateImageDecodeTask( |
982 Tile* tile, | 986 Tile* tile, |
983 SkPixelRef* pixel_ref) { | 987 SkPixelRef* pixel_ref) { |
984 return make_scoped_refptr(new ImageDecodeTaskImpl( | 988 return make_scoped_refptr(new ImageDecodeTaskImpl( |
985 pixel_ref, | 989 pixel_ref, |
986 tile->layer_id(), | 990 tile->layer_id(), |
987 rendering_stats_instrumentation_, | 991 rendering_stats_instrumentation_, |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1062 pixel_ref_tasks.erase(task_it); | 1066 pixel_ref_tasks.erase(task_it); |
1063 } | 1067 } |
1064 | 1068 |
1065 void TileManager::OnRasterTaskCompleted( | 1069 void TileManager::OnRasterTaskCompleted( |
1066 Tile::Id tile_id, | 1070 Tile::Id tile_id, |
1067 scoped_ptr<ScopedResource> resource, | 1071 scoped_ptr<ScopedResource> resource, |
1068 RasterMode raster_mode, | 1072 RasterMode raster_mode, |
1069 const PicturePileImpl::Analysis& analysis, | 1073 const PicturePileImpl::Analysis& analysis, |
1070 bool was_canceled) { | 1074 bool was_canceled) { |
1071 TileMap::iterator it = tiles_.find(tile_id); | 1075 TileMap::iterator it = tiles_.find(tile_id); |
1072 if (it == tiles_.end()) { | 1076 DCHECK(it != tiles_.end()); |
1073 ++update_visible_tiles_stats_.canceled_count; | |
1074 resource_pool_->ReleaseResource(resource.Pass()); | |
1075 return; | |
1076 } | |
1077 | 1077 |
1078 Tile* tile = it->second; | 1078 Tile* tile = it->second; |
1079 ManagedTileState& mts = tile->managed_state(); | 1079 ManagedTileState& mts = tile->managed_state(); |
1080 ManagedTileState::TileVersion& tile_version = mts.tile_versions[raster_mode]; | 1080 ManagedTileState::TileVersion& tile_version = mts.tile_versions[raster_mode]; |
1081 DCHECK(tile_version.raster_task_); | 1081 DCHECK(tile_version.raster_task_); |
1082 orphan_raster_tasks_.push_back(tile_version.raster_task_); | |
1083 tile_version.raster_task_ = NULL; | 1082 tile_version.raster_task_ = NULL; |
1084 | 1083 |
1085 if (was_canceled) { | 1084 if (was_canceled) { |
1086 ++update_visible_tiles_stats_.canceled_count; | 1085 ++update_visible_tiles_stats_.canceled_count; |
1087 resource_pool_->ReleaseResource(resource.Pass()); | 1086 resource_pool_->ReleaseResource(resource.Pass()); |
1088 return; | 1087 return; |
1089 } | 1088 } |
1090 | 1089 |
1091 ++update_visible_tiles_stats_.completed_count; | 1090 ++update_visible_tiles_stats_.completed_count; |
1092 | 1091 |
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1575 void TileManager::CheckIfReadyToActivate() { | 1574 void TileManager::CheckIfReadyToActivate() { |
1576 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); | 1575 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); |
1577 | 1576 |
1578 rasterizer_->CheckForCompletedTasks(); | 1577 rasterizer_->CheckForCompletedTasks(); |
1579 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 1578 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
1580 | 1579 |
1581 if (IsReadyToActivate()) | 1580 if (IsReadyToActivate()) |
1582 client_->NotifyReadyToActivate(); | 1581 client_->NotifyReadyToActivate(); |
1583 } | 1582 } |
1584 | 1583 |
1584 // static | |
1585 bool TileManager::TileHasRasterTask(const Tile* tile) { | |
1586 const ManagedTileState& mts = tile->managed_state(); | |
1587 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) { | |
1588 if (mts.tile_versions[mode].raster_task_) | |
1589 return true; | |
1590 } | |
1591 return false; | |
1592 } | |
1593 | |
1585 } // namespace cc | 1594 } // namespace cc |
OLD | NEW |