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 71 matching lines @@
   state_machine_.SetVisible(visible);
   UpdateCompositorTimingHistoryRecordingEnabled();
   ProcessScheduledActions();
 }
 
 void Scheduler::SetCanDraw(bool can_draw) {
   state_machine_.SetCanDraw(can_draw);
   ProcessScheduledActions();
 }
 
-void Scheduler::NotifyReadyToActivate() {
+void Scheduler::NotifyReadyToActivate(int sync_tree) {
   compositor_timing_history_->ReadyToActivate();
   state_machine_.NotifyReadyToActivate();
+  // Note the activate source-frame and timestamp
+  if (sync_tree != 0) {
+    ready_to_activate_time_.emplace_back(
+        std::make_pair(sync_tree, base::TimeTicks::Now()));

[brianderson, 2017/04/10 23:12:47]

I was under the impression you might be able to remove the std::make_pair here
with emplace_back. Is that possible?

[panicker, 2017/04/11 22:19:37]

Good catch, done.

+    /* TODO: REMOVE ME */
+    fprintf(stderr, "\n\t\tScheduler::NotifyReadyToActivate: synctree: %d",
+            sync_tree);
+  }
   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.
+        begin_main_frame_args_.ready_to_activate_time =
+            std::move(ready_to_activate_time_);

[brianderson, 2017/04/10 23:12:47]

After the move, ready_to_activate_time_ is in an valid but unspecified state.
clear() should be called on it so it's in a valid and specified state.

[panicker, 2017/04/11 22:19:37]

Done.

         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(),
       true);
 }
 
 }  // namespace cc