Chromium Code Reviews| Index: cc/resources/tile_manager.cc |
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc |
| index 86874e75bcb7345dd08b953b0d304f01d77afa38..d1b715aebdb089059ded42522423dba999623840 100644 |
| --- a/cc/resources/tile_manager.cc |
| +++ b/cc/resources/tile_manager.cc |
| @@ -239,7 +239,6 @@ TileManager::TileManager( |
| scheduled_raster_task_limit_(scheduled_raster_task_limit), |
| all_tiles_that_need_to_be_rasterized_are_scheduled_(true), |
| rendering_stats_instrumentation_(rendering_stats_instrumentation), |
| - did_initialize_visible_tile_(false), |
| did_check_for_completed_tasks_since_last_schedule_tasks_(true), |
| did_oom_on_last_assign_(false), |
| ready_to_activate_check_notifier_( |
| @@ -318,6 +317,9 @@ void TileManager::DidFinishRunningTasks(TaskSet task_set) { |
| if (task_set == ALL) { |
| TRACE_EVENT1("cc", "TileManager::DidFinishRunningTasks", "task_set", "ALL"); |
| + rasterizer_->CheckForCompletedTasks(); |
|
enne (OOO)
2014/10/29 20:34:44
Should this just be a call to UpdateVisibleTiles?
danakj
2014/10/30 15:04:52
Sure, done.
|
| + did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
| + |
| bool memory_usage_above_limit = resource_pool_->total_memory_usage_bytes() > |
| global_state_.soft_memory_limit_in_bytes; |
| @@ -327,9 +329,6 @@ void TileManager::DidFinishRunningTasks(TaskSet task_set) { |
| !memory_usage_above_limit) |
| return; |
| - rasterizer_->CheckForCompletedTasks(); |
| - did_check_for_completed_tasks_since_last_schedule_tasks_ = true; |
| - |
| TileVector tiles_that_need_to_be_rasterized; |
| AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized); |
| @@ -430,7 +429,7 @@ void TileManager::ManageTiles(const GlobalStateThatImpactsTilePriority& state) { |
| resource_pool_->acquired_memory_usage_bytes()); |
| } |
| -bool TileManager::UpdateVisibleTiles() { |
| +void TileManager::UpdateVisibleTiles() { |
| TRACE_EVENT0("cc", "TileManager::UpdateVisibleTiles"); |
| rasterizer_->CheckForCompletedTasks(); |
| @@ -443,10 +442,6 @@ bool TileManager::UpdateVisibleTiles() { |
| "stats", |
| RasterTaskCompletionStatsAsValue(update_visible_tiles_stats_)); |
| update_visible_tiles_stats_ = RasterTaskCompletionStats(); |
| - |
| - bool did_initialize_visible_tile = did_initialize_visible_tile_; |
| - did_initialize_visible_tile_ = false; |
| - return did_initialize_visible_tile; |
| } |
| scoped_refptr<base::debug::ConvertableToTraceFormat> |
| @@ -822,9 +817,6 @@ void TileManager::OnRasterTaskCompleted( |
| mts.draw_info.resource_ = resource.Pass(); |
| } |
| - if (tile->priority(ACTIVE_TREE).distance_to_visible == 0.f) |
| - did_initialize_visible_tile_ = true; |
| - |
| client_->NotifyTileStateChanged(tile); |
| } |