| Index: cc/test/fake_layer_tree_host_impl.cc
|
| diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc
|
| index bfac501fe0d743dade4d47ad55fc40d36493508c..7378a63f5bab54434b099e4623b624fe304bad17 100644
|
| --- a/cc/test/fake_layer_tree_host_impl.cc
|
| +++ b/cc/test/fake_layer_tree_host_impl.cc
|
| @@ -57,14 +57,19 @@ void FakeLayerTreeHostImpl::CreatePendingTree() {
|
| }
|
|
|
| BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const {
|
| - if (!current_begin_frame_args_.IsValid())
|
| - return LayerTreeHostImpl::CurrentBeginFrameArgs();
|
| - return current_begin_frame_args_;
|
| + if (!current_begin_frame_tracker_.HasFinished()) {
|
| + return current_begin_frame_tracker_.Get();
|
| + } else {
|
| + return current_begin_frame_tracker_.Last();
|
| + }
|
| }
|
|
|
| void FakeLayerTreeHostImpl::SetCurrentBeginFrameArgs(
|
| const BeginFrameArgs& args) {
|
| - current_begin_frame_args_ = args;
|
| + if (!current_begin_frame_tracker_.HasFinished()) {
|
| + current_begin_frame_tracker_.Finish();
|
| + }
|
| + current_begin_frame_tracker_.Start(args);
|
| }
|
|
|
| int FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(LayerImpl* layer) {
|
|
|