| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index d7f4915204ee13e9f3972161d02b2bc10587901f..8ada087aa448dfe22efea70586a7f3208fab7939 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -219,7 +219,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_(
|
| @@ -371,9 +370,7 @@ void TileManager::DidFinishRunningTasks(TaskSet task_set) {
|
| }
|
|
|
| if (task_set == REQUIRED_FOR_DRAW) {
|
| - TRACE_EVENT1("cc",
|
| - "TileManager::DidFinishRunningTasks",
|
| - "task_set",
|
| + TRACE_EVENT1("cc", "TileManager::DidFinishRunningTasks", "task_set",
|
| "REQUIRED_FOR_DRAW");
|
| ready_to_draw_check_notifier_.Schedule();
|
| return;
|
| @@ -422,7 +419,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();
|
| @@ -435,10 +432,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>
|
| @@ -817,9 +810,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);
|
| }
|
|
|
| @@ -868,8 +858,7 @@ bool TileManager::IsReadyToDraw() const {
|
| const std::vector<PictureLayerImpl*>& layers = client_->GetPictureLayers();
|
|
|
| for (std::vector<PictureLayerImpl*>::const_iterator it = layers.begin();
|
| - it != layers.end();
|
| - ++it) {
|
| + it != layers.end(); ++it) {
|
| if (!(*it)->AllTilesRequiredForDrawAreReadyToDraw())
|
| return false;
|
| }
|
|
|