Plumb activation time to main

cc/scheduler/scheduler.cc

 // Copyright 2011 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/scheduler/scheduler.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 74 matching lines @@
 }
 
 void Scheduler::SetCanDraw(bool can_draw) {
   state_machine_.SetCanDraw(can_draw);
   ProcessScheduledActions();
 }
 
 void Scheduler::NotifyReadyToActivate() {
   compositor_timing_history_->ReadyToActivate();
   state_machine_.NotifyReadyToActivate();
+  // Note the activate source-frame and timestamp
+  if (client_->SyncTreeSourceFrameNumber() != 0) {
+    ready_to_activate_source_frame_number_ =
+        client_->SyncTreeSourceFrameNumber();

[brianderson, 2017/03/30 18:32:03]

If you store this information in the ProxyImpl, you wouldn't need to expose the
SyncTreeSourceFrameNumber here. If you do need it here though, you could pass it
in as an argument to NotifyReadyToActivate.

Also, it's possible for there to be 2 NotifyReadyToActivates between 2
ScheduledActionSendBeginMainFrames with the "main frame before activate" feature
sunnyps recently implemented. So we'd need to store a vector of these pairs to
forward to the main thread.

[panicker, 2017/03/30 21:31:25]

The reason I did this here as opposed to ProxyImpl is because ProxyImpl does not
mutate BeginFrameArgs and passes around const ref where needed.
I can make it an argument to NotifyReadyToActivate as that's a bit simpler.

Making a vector makes sense to me, thanks.

+    // ready_to_activate_time_ = base::TimeTicks::Now();
+    fprintf(stderr, "\n\t\tScheduler::NotifyReadyToActivate: ptree: %d",
+            ready_to_activate_source_frame_number_);
+  }
   ProcessScheduledActions();
 }
 
 void Scheduler::NotifyReadyToDraw() {
   // Future work might still needed for crbug.com/352894.
   state_machine_.NotifyReadyToDraw();
   ProcessScheduledActions();
 }
 
 void Scheduler::SetBeginFrameSource(BeginFrameSource* source) {
@@ skipping 515 matching lines @@
         &inside_action_, action);
     switch (action) {
       case SchedulerStateMachine::ACTION_NONE:
         break;
       case SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME:
         compositor_timing_history_->WillBeginMainFrame(
             begin_main_frame_args_.on_critical_path,
             begin_main_frame_args_.frame_time);
         state_machine_.WillSendBeginMainFrame();
         // TODO(brianderson): Pass begin_main_frame_args_ directly to client.
+        // Add the args for activate.
+        begin_main_frame_args_.ready_to_activate_time = ready_to_activate_time_;
+        begin_main_frame_args_.ready_to_activate_source_frame_number =
+            ready_to_activate_source_frame_number_;
         client_->ScheduledActionSendBeginMainFrame(begin_main_frame_args_);
         break;
       case SchedulerStateMachine::ACTION_COMMIT: {
         bool commit_has_no_updates = false;
         state_machine_.WillCommit(commit_has_no_updates);
         client_->ScheduledActionCommit();
         break;
       }
       case SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE:
         compositor_timing_history_->WillActivate();
@@ skipping 159 matching lines @@
 }
 
 BeginFrameAck Scheduler::CurrentBeginFrameAckForActiveTree() const {
   return BeginFrameAck(
       begin_main_frame_args_.source_id, begin_main_frame_args_.sequence_number,
       state_machine_.last_begin_frame_sequence_number_active_tree_was_fresh(),
       0, true);
 }
 
 }  // namespace cc