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) { |
reveman
2014/07/21 12:54:26
I think what vmpstr@ asked you to do is reset the
sohanjg
2014/07/21 14:43:12
Done.
Sorry, i misunderstood his comments, as the
| |
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 FreeResourcesForTile(tile); |
427 } | |
428 } | |
427 | 429 |
428 for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) { | 430 void TileManager::CleanUpReleasedTiles() { |
429 FreeResourceForTile(tile, static_cast<RasterMode>(mode)); | 431 DCHECK(prioritized_tiles_dirty_); |
430 orphan_raster_tasks_.push_back(mts.tile_versions[mode].raster_task_); | 432 std::vector<Tile*>::iterator it = released_tiles_.begin(); |
433 while (it != released_tiles_.end()) { | |
434 Tile* tile = *it; | |
435 | |
436 if (tile->HasRasterTask()) { | |
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(); |
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 |
(...skipping 13 matching lines...) Expand all Loading... | |
477 AssignGpuMemoryToTiles(&prioritized_tiles_, | 486 AssignGpuMemoryToTiles(&prioritized_tiles_, |
478 &tiles_that_need_to_be_rasterized); | 487 &tiles_that_need_to_be_rasterized); |
479 | 488 |
480 // |tiles_that_need_to_be_rasterized| will be empty when we reach a | 489 // |tiles_that_need_to_be_rasterized| will be empty when we reach a |
481 // steady memory state. Keep scheduling tasks until we reach this state. | 490 // steady memory state. Keep scheduling tasks until we reach this state. |
482 if (!tiles_that_need_to_be_rasterized.empty()) { | 491 if (!tiles_that_need_to_be_rasterized.empty()) { |
483 ScheduleTasks(tiles_that_need_to_be_rasterized); | 492 ScheduleTasks(tiles_that_need_to_be_rasterized); |
484 return; | 493 return; |
485 } | 494 } |
486 | 495 |
496 FreeResourcesForReleasedTiles(); | |
497 | |
487 resource_pool_->ReduceResourceUsage(); | 498 resource_pool_->ReduceResourceUsage(); |
488 | 499 |
489 // We don't reserve memory for required-for-activation tiles during | 500 // We don't reserve memory for required-for-activation tiles during |
490 // accelerated gestures, so we just postpone activation when we don't | 501 // accelerated gestures, so we just postpone activation when we don't |
491 // have these tiles, and activate after the accelerated gesture. | 502 // have these tiles, and activate after the accelerated gesture. |
492 bool allow_rasterize_on_demand = | 503 bool allow_rasterize_on_demand = |
493 global_state_.tree_priority != SMOOTHNESS_TAKES_PRIORITY; | 504 global_state_.tree_priority != SMOOTHNESS_TAKES_PRIORITY; |
494 | 505 |
495 // Use on-demand raster for any required-for-activation tiles that have not | 506 // Use on-demand raster for any required-for-activation tiles that have not |
496 // been been assigned memory after reaching a steady memory state. This | 507 // been been assigned memory after reaching a steady memory state. This |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
966 | 977 |
967 // We must reduce the amount of unused resoruces before calling | 978 // We must reduce the amount of unused resoruces before calling |
968 // ScheduleTasks to prevent usage from rising above limits. | 979 // ScheduleTasks to prevent usage from rising above limits. |
969 resource_pool_->ReduceResourceUsage(); | 980 resource_pool_->ReduceResourceUsage(); |
970 | 981 |
971 // Schedule running of |raster_tasks_|. This replaces any previously | 982 // Schedule running of |raster_tasks_|. This replaces any previously |
972 // scheduled tasks and effectively cancels all tasks not present | 983 // scheduled tasks and effectively cancels all tasks not present |
973 // in |raster_tasks_|. | 984 // in |raster_tasks_|. |
974 rasterizer_->ScheduleTasks(&raster_queue_); | 985 rasterizer_->ScheduleTasks(&raster_queue_); |
975 | 986 |
976 // It's now safe to clean up orphan tasks as raster worker pool is not | |
977 // allowed to keep around unreferenced raster tasks after ScheduleTasks() has | |
978 // been called. | |
979 orphan_raster_tasks_.clear(); | |
980 | |
981 did_check_for_completed_tasks_since_last_schedule_tasks_ = false; | 987 did_check_for_completed_tasks_since_last_schedule_tasks_ = false; |
982 } | 988 } |
983 | 989 |
984 scoped_refptr<ImageDecodeTask> TileManager::CreateImageDecodeTask( | 990 scoped_refptr<ImageDecodeTask> TileManager::CreateImageDecodeTask( |
985 Tile* tile, | 991 Tile* tile, |
986 SkPixelRef* pixel_ref) { | 992 SkPixelRef* pixel_ref) { |
987 return make_scoped_refptr(new ImageDecodeTaskImpl( | 993 return make_scoped_refptr(new ImageDecodeTaskImpl( |
988 pixel_ref, | 994 pixel_ref, |
989 tile->layer_id(), | 995 tile->layer_id(), |
990 rendering_stats_instrumentation_, | 996 rendering_stats_instrumentation_, |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1065 pixel_ref_tasks.erase(task_it); | 1071 pixel_ref_tasks.erase(task_it); |
1066 } | 1072 } |
1067 | 1073 |
1068 void TileManager::OnRasterTaskCompleted( | 1074 void TileManager::OnRasterTaskCompleted( |
1069 Tile::Id tile_id, | 1075 Tile::Id tile_id, |
1070 scoped_ptr<ScopedResource> resource, | 1076 scoped_ptr<ScopedResource> resource, |
1071 RasterMode raster_mode, | 1077 RasterMode raster_mode, |
1072 const PicturePileImpl::Analysis& analysis, | 1078 const PicturePileImpl::Analysis& analysis, |
1073 bool was_canceled) { | 1079 bool was_canceled) { |
1074 TileMap::iterator it = tiles_.find(tile_id); | 1080 TileMap::iterator it = tiles_.find(tile_id); |
1075 if (it == tiles_.end()) { | 1081 DCHECK(it != tiles_.end()); |
1076 ++update_visible_tiles_stats_.canceled_count; | |
1077 resource_pool_->ReleaseResource(resource.Pass()); | |
1078 return; | |
1079 } | |
1080 | 1082 |
1081 Tile* tile = it->second; | 1083 Tile* tile = it->second; |
1082 ManagedTileState& mts = tile->managed_state(); | 1084 ManagedTileState& mts = tile->managed_state(); |
1083 ManagedTileState::TileVersion& tile_version = mts.tile_versions[raster_mode]; | 1085 ManagedTileState::TileVersion& tile_version = mts.tile_versions[raster_mode]; |
1084 DCHECK(tile_version.raster_task_); | 1086 DCHECK(tile_version.raster_task_); |
1085 orphan_raster_tasks_.push_back(tile_version.raster_task_); | |
1086 tile_version.raster_task_ = NULL; | 1087 tile_version.raster_task_ = NULL; |
1087 | 1088 |
1088 if (was_canceled) { | 1089 if (was_canceled) { |
1089 ++update_visible_tiles_stats_.canceled_count; | 1090 ++update_visible_tiles_stats_.canceled_count; |
1090 resource_pool_->ReleaseResource(resource.Pass()); | 1091 resource_pool_->ReleaseResource(resource.Pass()); |
1091 return; | 1092 return; |
1092 } | 1093 } |
1093 | 1094 |
1094 ++update_visible_tiles_stats_.completed_count; | 1095 ++update_visible_tiles_stats_.completed_count; |
1095 | 1096 |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1593 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); | 1594 TRACE_EVENT0("cc", "TileManager::CheckIfReadyToActivate"); |
1594 | 1595 |
1595 rasterizer_->CheckForCompletedTasks(); | 1596 rasterizer_->CheckForCompletedTasks(); |
1596 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; | 1597 did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
1597 | 1598 |
1598 if (IsReadyToActivate()) | 1599 if (IsReadyToActivate()) |
1599 client_->NotifyReadyToActivate(); | 1600 client_->NotifyReadyToActivate(); |
1600 } | 1601 } |
1601 | 1602 |
1602 } // namespace cc | 1603 } // namespace cc |
OLD | NEW |