Index: cc/scheduler/scheduler_state_machine.cc |
diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc |
index fda6e6b5881526c1757cb742fbf24eabfe010632..3bfba3ccf0bef972b3fbddbd5c2834b3afedbe0b 100644 |
--- a/cc/scheduler/scheduler_state_machine.cc |
+++ b/cc/scheduler/scheduler_state_machine.cc |
@@ -29,6 +29,7 @@ SchedulerStateMachine::SchedulerStateMachine(const SchedulerSettings& settings) |
expect_immediate_begin_frame_for_main_thread_(false), |
main_thread_needs_layer_textures_(false), |
inside_begin_frame_(false), |
+ last_begin_frame_args_(BeginFrameArgs::CreateInvalid()), |
visible_(false), |
can_start_(false), |
can_draw_(false), |
@@ -84,7 +85,12 @@ std::string SchedulerStateMachine::ToString() { |
base::StringAppendF(&str, "inside_begin_frame_ = %d; ", |
inside_begin_frame_); |
base::StringAppendF(&str, "last_frame_time_ = %"PRId64"; ", |
- (last_frame_time_ - base::TimeTicks()).InMilliseconds()); |
+ (last_begin_frame_args_.frame_time() - base::TimeTicks()) |
+ .InMilliseconds()); |
+ base::StringAppendF(&str, "last_deadline_ = %"PRId64"; ", |
+ (last_begin_frame_args_.deadline() - base::TimeTicks()).InMilliseconds()); |
+ base::StringAppendF(&str, "last_interval_ = %"PRId64"; ", |
+ last_begin_frame_args_.interval().InMilliseconds()); |
base::StringAppendF(&str, "visible_ = %d; ", visible_); |
base::StringAppendF(&str, "can_start_ = %d; ", can_start_); |
base::StringAppendF(&str, "can_draw_ = %d; ", can_draw_); |
@@ -362,12 +368,9 @@ bool SchedulerStateMachine::BeginFrameNeededByImplThread() const { |
output_surface_state_ == OUTPUT_SURFACE_ACTIVE; |
} |
-void SchedulerStateMachine::DidEnterBeginFrame() { |
+void SchedulerStateMachine::DidEnterBeginFrame(BeginFrameArgs args) { |
inside_begin_frame_ = true; |
-} |
- |
-void SchedulerStateMachine::SetFrameTime(base::TimeTicks frame_time) { |
- last_frame_time_ = frame_time; |
+ last_begin_frame_args_ = args; |
} |
void SchedulerStateMachine::DidLeaveBeginFrame() { |