diff options
Diffstat (limited to 'chromium/cc/scheduler/scheduler.cc')
| -rw-r--r-- | chromium/cc/scheduler/scheduler.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chromium/cc/scheduler/scheduler.cc b/chromium/cc/scheduler/scheduler.cc index 6a14640dcbb..523b09c2e4f 100644 --- a/chromium/cc/scheduler/scheduler.cc +++ b/chromium/cc/scheduler/scheduler.cc @@ -196,10 +196,10 @@ void Scheduler::DidPrepareTiles() { state_machine_.DidPrepareTiles(); } -void Scheduler::DidPresentCompositorFrame(uint32_t frame_token, - base::TimeTicks presentation_time) { - compositor_timing_history_->DidPresentCompositorFrame(frame_token, - presentation_time); +void Scheduler::DidPresentCompositorFrame( + uint32_t frame_token, + const viz::FrameTimingDetails& details) { + compositor_timing_history_->DidPresentCompositorFrame(frame_token, details); } void Scheduler::DidLoseLayerTreeFrameSink() { @@ -589,7 +589,6 @@ void Scheduler::SendDidNotProduceFrame(const viz::BeginFrameArgs& args) { if (last_begin_frame_ack_.source_id == args.source_id && last_begin_frame_ack_.sequence_number == args.sequence_number) return; - compositor_timing_history_->DidNotProduceFrame(); last_begin_frame_ack_ = viz::BeginFrameAck(args, false /* has_damage */); client_->DidNotProduceFrame(last_begin_frame_ack_); } @@ -732,8 +731,9 @@ void Scheduler::DrawIfPossible() { drawing_with_new_active_tree, begin_impl_frame_tracker_.DangerousMethodCurrentOrLast().frame_time, client_->CompositedAnimationsCount(), - client_->MainThreadAnimationsCount(), - client_->CurrentFrameHadRAF(), client_->NextFrameHasPendingRAF()); + client_->MainThreadAnimationsCount(), client_->CurrentFrameHadRAF(), + client_->NextFrameHasPendingRAF(), + client_->HasCustomPropertyAnimations()); } void Scheduler::DrawForced() { @@ -750,8 +750,9 @@ void Scheduler::DrawForced() { drawing_with_new_active_tree, begin_impl_frame_tracker_.DangerousMethodCurrentOrLast().frame_time, client_->CompositedAnimationsCount(), - client_->MainThreadAnimationsCount(), - client_->CurrentFrameHadRAF(), client_->NextFrameHasPendingRAF()); + client_->MainThreadAnimationsCount(), client_->CurrentFrameHadRAF(), + client_->NextFrameHasPendingRAF(), + client_->HasCustomPropertyAnimations()); } void Scheduler::SetDeferBeginMainFrame(bool defer_begin_main_frame) { |