cc: Send notification of tasks completion directly without scheduling.

cc/tiles/tile_manager.cc

Index: cc/tiles/tile_manager.cc
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc
index 198f123e92e6b61fc1d57d3d690e69357f8d11fa..ca1cbdc0c37f49d8eb64d079f4f6cc14ce6dc5bc 100644
--- a/cc/tiles/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -337,13 +337,6 @@ TileManager::TileManager(TileManagerClient* client,
       all_tiles_that_need_to_be_rasterized_are_scheduled_(true),
       did_check_for_completed_tasks_since_last_schedule_tasks_(true),
       did_oom_on_last_assign_(false),
-      more_tiles_need_prepare_check_notifier_(
-          task_runner_.get(),
-          base::Bind(&TileManager::CheckIfMoreTilesNeedToBePrepared,
-                     base::Unretained(this))),
-      signals_check_notifier_(task_runner_.get(),
-                              base::Bind(&TileManager::CheckAndIssueSignals,
-                                         base::Unretained(this))),
       has_scheduled_tile_tasks_(false),
       prepare_tiles_count_(0u),
       next_tile_id_(0u),
@@ -374,8 +367,6 @@ void TileManager::FinishTasksAndCleanUp() {
 
   tile_task_manager_ = nullptr;
   resource_pool_ = nullptr;
-  more_tiles_need_prepare_check_notifier_.Cancel();
-  signals_check_notifier_.Cancel();
   task_set_finished_weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
@@ -425,16 +416,16 @@ void TileManager::DidFinishRunningTileTasksRequiredForActivation() {
                "TileManager::DidFinishRunningTileTasksRequiredForActivation");
   TRACE_EVENT_ASYNC_STEP_INTO1("cc", "ScheduledTasks", this, "running", "state",
                                ScheduledTasksStateAsValue());
-  signals_.ready_to_activate = true;
-  signals_check_notifier_.Schedule();
+  DCHECK(tile_task_manager_);

[ericrk, 2016/05/26 22:53:37]

Why are we DCHECKing this here? if this is used in
CheckAndNiotifyReadyToAcitvate, we should check it there instead probably?

same a few other places.

+  CheckAndNotifyReadyToActivate();
 }
 
 void TileManager::DidFinishRunningTileTasksRequiredForDraw() {
   TRACE_EVENT0("cc", "TileManager::DidFinishRunningTileTasksRequiredForDraw");
   TRACE_EVENT_ASYNC_STEP_INTO1("cc", "ScheduledTasks", this, "running", "state",
                                ScheduledTasksStateAsValue());
-  signals_.ready_to_draw = true;
-  signals_check_notifier_.Schedule();
+  DCHECK(tile_task_manager_);
+  CheckAndNotifyReadyToDraw();
 }
 
 void TileManager::DidFinishRunningAllTileTasks() {
@@ -453,12 +444,11 @@ void TileManager::DidFinishRunningAllTileTasks() {
     // TODO(ericrk): We should find a better way to safely handle re-entrant

[ericrk, 2016/05/26 22:53:36]

you can remove this TODO and close the associated bug if this patch lands.

     // notifications than always having to schedule a new task.
     // http://crbug.com/498439
-    signals_.all_tile_tasks_completed = true;
-    signals_check_notifier_.Schedule();
+    CheckAndNotifyAllTileTasksCompleted();
     return;
   }
 
-  more_tiles_need_prepare_check_notifier_.Schedule();
+  CheckIfMoreTilesNeedToBePrepared();
 }
 
 bool TileManager::PrepareTiles(
@@ -474,7 +464,6 @@ bool TileManager::PrepareTiles(
     return false;
   }
 
-  signals_.reset();
   global_state_ = state;
 
   // We need to call CheckForCompletedTasks() once in-between each call
@@ -1076,44 +1065,43 @@ bool TileManager::IsReadyToDraw() const {
       RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW);
 }
 
-void TileManager::CheckAndIssueSignals() {
-  TRACE_EVENT0("cc", "TileManager::CheckAndIssueSignals");
+void TileManager::CheckAndNotifyReadyToActivate() {
+  TRACE_EVENT0("cc", "TileManager::CheckAndNotifyReadyToActivate");
   tile_task_manager_->CheckForCompletedTasks();
   did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
 
   // Ready to activate.
-  if (signals_.ready_to_activate && !signals_.did_notify_ready_to_activate) {
-    signals_.ready_to_activate = false;
-    if (IsReadyToActivate()) {
-      TRACE_EVENT0("disabled-by-default-cc.debug",
-                   "TileManager::CheckAndIssueSignals - ready to activate");
-      signals_.did_notify_ready_to_activate = true;
-      client_->NotifyReadyToActivate();
-    }
+  if (IsReadyToActivate()) {
+    TRACE_EVENT0(
+        "disabled-by-default-cc.debug",
+        "TileManager::CheckAndNotifyReadyToActivate - ready to activate");
+    client_->NotifyReadyToActivate();
   }
+}
+void TileManager::CheckAndNotifyReadyToDraw() {
+  TRACE_EVENT0("cc", "TileManager::CheckAndNotifyReadyToDraw");
+  tile_task_manager_->CheckForCompletedTasks();
+  did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
 
   // Ready to draw.
-  if (signals_.ready_to_draw && !signals_.did_notify_ready_to_draw) {
-    signals_.ready_to_draw = false;
-    if (IsReadyToDraw()) {
-      TRACE_EVENT0("disabled-by-default-cc.debug",
-                   "TileManager::CheckAndIssueSignals - ready to draw");
-      signals_.did_notify_ready_to_draw = true;
-      client_->NotifyReadyToDraw();
-    }
+  if (IsReadyToDraw()) {
+    TRACE_EVENT0("disabled-by-default-cc.debug",
+                 "TileManager::CheckAndNotifyReadyToDraw - ready to draw");
+    client_->NotifyReadyToDraw();
   }
+}
+
+void TileManager::CheckAndNotifyAllTileTasksCompleted() {
+  TRACE_EVENT0("cc", "TileManager::CheckAndNotifyAllTileTasksCompleted");
+  tile_task_manager_->CheckForCompletedTasks();
+  did_check_for_completed_tasks_since_last_schedule_tasks_ = true;
 
   // All tile tasks completed.
-  if (signals_.all_tile_tasks_completed &&
-      !signals_.did_notify_all_tile_tasks_completed) {
-    signals_.all_tile_tasks_completed = false;
-    if (!has_scheduled_tile_tasks_) {
-      TRACE_EVENT0(
-          "disabled-by-default-cc.debug",
-          "TileManager::CheckAndIssueSignals - all tile tasks completed");
-      signals_.did_notify_all_tile_tasks_completed = true;
-      client_->NotifyAllTileTasksCompleted();
-    }
+  if (!has_scheduled_tile_tasks_) {
+    TRACE_EVENT0("disabled-by-default-cc.debug",
+                 "TileManager::CheckAndNotifyAllTileTasksCompleted - all tile "
+                 "tasks completed");
+    client_->NotifyAllTileTasksCompleted();
   }
 }
 
@@ -1149,8 +1137,7 @@ void TileManager::CheckIfMoreTilesNeedToBePrepared() {
   resource_pool_->ReduceResourceUsage();
   image_decode_controller_->ReduceCacheUsage();
 
-  signals_.all_tile_tasks_completed = true;
-  signals_check_notifier_.Schedule();
+  bool need_to_signal_all_tile_tasks_completed = true;

[ericrk, 2016/05/26 22:53:36]

no need fo rthis variable if it's always true... just call
CheckAndNotifyAllTileTasksCompleted at the end of the fn.

 
   // We don't reserve memory for required-for-activation tiles during
   // accelerated gestures, so we just postpone activation when we don't
@@ -1179,13 +1166,14 @@ void TileManager::CheckIfMoreTilesNeedToBePrepared() {
       global_state_.tree_priority,
       RasterTilePriorityQueue::Type::REQUIRED_FOR_DRAW));
 
-  DCHECK(IsReadyToActivate());
-  DCHECK(IsReadyToDraw());
-  signals_.ready_to_activate = need_to_signal_activate;
-  signals_.ready_to_draw = need_to_signal_draw;
-  // TODO(ericrk): Investigate why we need to schedule this (not just call it
-  // inline). http://crbug.com/498439
-  signals_check_notifier_.Schedule();
+  if (need_to_signal_activate)
+    CheckAndNotifyReadyToActivate();
+
+  if (need_to_signal_draw)
+    CheckAndNotifyReadyToDraw();
+
+  if (need_to_signal_all_tile_tasks_completed)
+    CheckAndNotifyAllTileTasksCompleted();
 }
 
 bool TileManager::MarkTilesOutOfMemory(
@@ -1219,10 +1207,13 @@ TileManager::ScheduledTasksStateAsValue() const {
   std::unique_ptr<base::trace_event::TracedValue> state(
       new base::trace_event::TracedValue());
   state->BeginDictionary("tasks_pending");
-  state->SetBoolean("ready_to_activate", signals_.ready_to_activate);
-  state->SetBoolean("ready_to_draw", signals_.ready_to_draw);
-  state->SetBoolean("all_tile_tasks_completed",
-                    signals_.all_tile_tasks_completed);
+
+  // TODO(prashant.n): Modify this accordingly.

[ericrk, 2016/05/26 22:53:36]

We'll need to fix this before landing.

+  // state->SetBoolean("ready_to_activate", signals_.ready_to_activate);
+  // state->SetBoolean("ready_to_draw", signals_.ready_to_draw);
+  // state->SetBoolean("all_tile_tasks_completed",
+  //                   signals_.all_tile_tasks_completed);
+
   state->EndDictionary();
   return std::move(state);
 }
@@ -1299,17 +1290,4 @@ bool TileManager::MemoryUsage::Exceeds(const MemoryUsage& limit) const {
          resource_count_ > limit.resource_count_;
 }
 
-TileManager::Signals::Signals() {
-  reset();
-}
-
-void TileManager::Signals::reset() {
-  ready_to_activate = false;
-  did_notify_ready_to_activate = false;
-  ready_to_draw = false;
-  did_notify_ready_to_draw = false;
-  all_tile_tasks_completed = false;
-  did_notify_all_tile_tasks_completed = false;
-}
-
 }  // namespace cc