| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index c785cf6fd7fec0b0b4c17985ef1be5f7540efaa0..6a270b9cb7afd507fcea3938048404369953944f 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_(
|
| @@ -324,8 +323,10 @@ void TileManager::DidFinishRunningTasks(TaskSet task_set) {
|
| // When OOM, keep re-assigning memory until we reach a steady state
|
| // where top-priority tiles are initialized.
|
| if (all_tiles_that_need_to_be_rasterized_are_scheduled_ &&
|
| - !memory_usage_above_limit)
|
| + !memory_usage_above_limit) {
|
| + client_->FinishedRasterQueue();
|
| return;
|
| + }
|
|
|
| rasterizer_->CheckForCompletedTasks();
|
| did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
|
| @@ -430,7 +431,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 +444,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 +819,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);
|
| }
|
|
|
|
|