Chromium Code Reviews| 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 84f75e0016a60efa06fb2da30bcc4658137b0c37..fb0f1ea1705046d093dfe0d0fdd6fb6807ffc8d6 100644 |
| --- a/cc/test/fake_layer_tree_host_impl.cc |
| +++ b/cc/test/fake_layer_tree_host_impl.cc |
| @@ -51,15 +51,16 @@ void FakeLayerTreeHostImpl::CreatePendingTree() { |
| 1.f, 1.f / arbitrary_large_page_scale, arbitrary_large_page_scale); |
| } |
| -base::TimeTicks FakeLayerTreeHostImpl::CurrentFrameTimeTicks() { |
| - if (current_frame_time_ticks_.is_null()) |
| - return LayerTreeHostImpl::CurrentFrameTimeTicks(); |
| - return current_frame_time_ticks_; |
| +BeginFrameArgs FakeLayerTreeHostImpl::CurrentBeginFrameArgs() const { |
| + if (!current_begin_frame_args_.IsValid()) |
| + return LayerTreeHostImpl::CurrentBeginFrameArgs(); |
| + return current_begin_frame_args_; |
| } |
| void FakeLayerTreeHostImpl::SetCurrentFrameTimeTicks( |
|
mithro-old
2014/08/11 07:33:33
Should this be "SetCurrentBeginFrameArgs"?
Sami
2014/08/11 17:51:26
Yes, let's make them symmetric.
|
| - base::TimeTicks current_frame_time_ticks) { |
| - current_frame_time_ticks_ = current_frame_time_ticks; |
| + base::TimeTicks time_ticks) { |
| + current_begin_frame_args_ = BeginFrameArgs::Create( |
| + time_ticks, base::TimeTicks(), BeginFrameArgs::DefaultInterval()); |
| } |
| } // namespace cc |