SetNeedsRedraw directly when updating a visible tile.

cc/resources/tile_manager.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/tile_manager.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
@@ skipping 221 matching lines @@
     Rasterizer* rasterizer,
     RenderingStatsInstrumentation* rendering_stats_instrumentation,
     size_t scheduled_raster_task_limit)
     : client_(client),
       task_runner_(task_runner),
       resource_pool_(resource_pool),
       rasterizer_(rasterizer),
       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),
+      has_active_visible_tile_scheduled_(false),
       ready_to_activate_check_notifier_(
           task_runner_.get(),
           base::Bind(&TileManager::CheckIfReadyToActivate,
                      base::Unretained(this))) {
   rasterizer_->SetClient(this);
 }
 
 TileManager::~TileManager() {
   // Reset global state and manage. This should cause
   // our memory usage to drop to zero.
@@ skipping 56 matching lines @@
 
     delete tile;
     it = released_tiles_.erase(it);
   }
 }
 
 void TileManager::DidFinishRunningTasks(TaskSet task_set) {
   if (task_set == ALL) {
     TRACE_EVENT1("cc", "TileManager::DidFinishRunningTasks", "task_set", "ALL");
 
+    UpdateVisibleTiles();

[reveman, 2014/10/30 16:58:17]

UpdateVisibleTiles() is part of the public TileManager API. We shouldn't be
calling it internally. Something wrong with the design if that's necessary.

[danakj, 2014/10/30 16:59:53]

OK. It seems like we're just duplicating that function here.. but I can put that
back.

+
     bool memory_usage_above_limit = resource_pool_->total_memory_usage_bytes() >
                                     global_state_.soft_memory_limit_in_bytes;
 
     // 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)
       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);
 
     // |tiles_that_need_to_be_rasterized| will be empty when we reach a
     // steady memory state. Keep scheduling tasks until we reach this state.
     if (!tiles_that_need_to_be_rasterized.empty()) {
       ScheduleTasks(tiles_that_need_to_be_rasterized);
       return;
     }
 
@@ skipping 80 matching lines @@
                        "state",
                        BasicStateAsValue());
 
   TRACE_COUNTER_ID1("cc",
                     "unused_memory_bytes",
                     this,
                     resource_pool_->total_memory_usage_bytes() -
                         resource_pool_->acquired_memory_usage_bytes());
 }
 
-bool TileManager::UpdateVisibleTiles() {
+void TileManager::UpdateVisibleTiles() {
   TRACE_EVENT0("cc", "TileManager::UpdateVisibleTiles");
 
   rasterizer_->CheckForCompletedTasks();
   did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
 
   TRACE_EVENT_INSTANT1(
       "cc",
       "DidUpdateVisibleTiles",
       TRACE_EVENT_SCOPE_THREAD,
       "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>
 TileManager::BasicStateAsValue() const {
   scoped_refptr<base::debug::TracedValue> value =
       new base::debug::TracedValue();
   BasicStateAsValueInto(value.get());
   return value;
 }
 
@@ skipping 206 matching lines @@
     const TileVector& tiles_that_need_to_be_rasterized) {
   TRACE_EVENT1("cc",
                "TileManager::ScheduleTasks",
                "count",
                tiles_that_need_to_be_rasterized.size());
 
   DCHECK(did_check_for_completed_tasks_since_last_schedule_tasks_);
 
   raster_queue_.Reset();
 
+  has_active_visible_tile_scheduled_ = false;
+
   // Build a new task queue containing all task currently needed. Tasks
   // are added in order of priority, highest priority task first.
   for (TileVector::const_iterator it = tiles_that_need_to_be_rasterized.begin();
        it != tiles_that_need_to_be_rasterized.end();
        ++it) {
     Tile* tile = *it;
     ManagedTileState& mts = tile->managed_state();
 
+    if (tile->priority(ACTIVE_TREE).distance_to_visible == 0.f) {
+      has_active_visible_tile_scheduled_ = true;
+    }
+
     DCHECK(mts.draw_info.requires_resource());
     DCHECK(!mts.draw_info.resource_);
 
     if (!mts.raster_task.get())
       mts.raster_task = CreateRasterTask(tile);
 
     TaskSetCollection task_sets;
     if (tile->required_for_activation())
       task_sets.set(REQUIRED_FOR_ACTIVATION);
     task_sets.set(ALL);
@@ skipping 121 matching lines @@
   ++update_visible_tiles_stats_.completed_count;
 
   if (analysis.is_solid_color) {
     mts.draw_info.set_solid_color(analysis.solid_color);
     resource_pool_->ReleaseResource(resource.Pass());
   } else {
     mts.draw_info.set_use_resource();
     mts.draw_info.resource_ = resource.Pass();
   }
 
-  if (tile->priority(ACTIVE_TREE).distance_to_visible == 0.f)
-    did_initialize_visible_tile_ = true;
-
   client_->NotifyTileStateChanged(tile);
 }
 
 scoped_refptr<Tile> TileManager::CreateTile(RasterSource* raster_source,
                                             const gfx::Size& tile_size,
                                             const gfx::Rect& content_rect,
                                             float contents_scale,
                                             int layer_id,
                                             int source_frame_number,
                                             int flags) {
@@ skipping 84 matching lines @@
   result -= other;
   return result;
 }
 
 bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const {
   return memory_bytes_ > limit.memory_bytes_ ||
          resource_count_ > limit.resource_count_;
 }
 
 }  // namespace cc