OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/trees/single_thread_proxy.h" | 5 #include "cc/trees/single_thread_proxy.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "cc/debug/benchmark_instrumentation.h" | 9 #include "cc/debug/benchmark_instrumentation.h" |
10 #include "cc/output/context_provider.h" | 10 #include "cc/output/context_provider.h" |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
543 } | 543 } |
544 | 544 |
545 void SingleThreadProxy::DidCommitAndDrawFrame() { | 545 void SingleThreadProxy::DidCommitAndDrawFrame() { |
546 if (next_frame_is_newly_committed_frame_) { | 546 if (next_frame_is_newly_committed_frame_) { |
547 DebugScopedSetMainThread main(this); | 547 DebugScopedSetMainThread main(this); |
548 next_frame_is_newly_committed_frame_ = false; | 548 next_frame_is_newly_committed_frame_ = false; |
549 layer_tree_host_->DidCommitAndDrawFrame(); | 549 layer_tree_host_->DidCommitAndDrawFrame(); |
550 } | 550 } |
551 } | 551 } |
552 | 552 |
553 bool SingleThreadProxy::CommitPendingForTesting() { return false; } | 553 bool SingleThreadProxy::MainFrameWillHappenForTesting() { |
| 554 return false; |
| 555 } |
554 | 556 |
555 void SingleThreadProxy::SetNeedsBeginFrame(bool enable) { | 557 void SingleThreadProxy::SetNeedsBeginFrame(bool enable) { |
556 layer_tree_host_impl_->SetNeedsBeginFrame(enable); | 558 layer_tree_host_impl_->SetNeedsBeginFrame(enable); |
557 } | 559 } |
558 | 560 |
559 void SingleThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) { | 561 void SingleThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) { |
560 layer_tree_host_impl_->WillBeginImplFrame(args); | 562 layer_tree_host_impl_->WillBeginImplFrame(args); |
561 } | 563 } |
562 | 564 |
563 void SingleThreadProxy::ScheduledActionSendBeginMainFrame() { | 565 void SingleThreadProxy::ScheduledActionSendBeginMainFrame() { |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
688 | 690 |
689 base::TimeDelta SingleThreadProxy::CommitToActivateDurationEstimate() { | 691 base::TimeDelta SingleThreadProxy::CommitToActivateDurationEstimate() { |
690 return timing_history_.CommitToActivateDurationEstimate(); | 692 return timing_history_.CommitToActivateDurationEstimate(); |
691 } | 693 } |
692 | 694 |
693 void SingleThreadProxy::DidBeginImplFrameDeadline() { | 695 void SingleThreadProxy::DidBeginImplFrameDeadline() { |
694 layer_tree_host_impl_->ResetCurrentFrameTimeForNextFrame(); | 696 layer_tree_host_impl_->ResetCurrentFrameTimeForNextFrame(); |
695 } | 697 } |
696 | 698 |
697 } // namespace cc | 699 } // namespace cc |
OLD | NEW |