Chromium Code Reviews| Index: cc/trees/thread_proxy.cc |
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
| index b18b93a63518f976b00ff36c570f4b5ae57c7346..8f65de55d18e44d935d9c704094d65d41e4d9a04 100644 |
| --- a/cc/trees/thread_proxy.cc |
| +++ b/cc/trees/thread_proxy.cc |
| @@ -707,8 +707,8 @@ void ThreadProxy::ScheduledActionSendBeginMainFrame() { |
| scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state( |
| new BeginMainFrameAndCommitState); |
| begin_main_frame_state->begin_frame_id = begin_frame_id; |
| - begin_main_frame_state->monotonic_frame_begin_time = |
| - impl().layer_tree_host_impl->CurrentFrameTimeTicks(); |
| + begin_main_frame_state->begin_frame_args = |
| + impl().layer_tree_host_impl->CurrentBeginFrameArgs(); |
| begin_main_frame_state->scroll_info = |
| impl().layer_tree_host_impl->ProcessScrollDeltas(); |
| @@ -794,12 +794,11 @@ void ThreadProxy::BeginMainFrame( |
| layer_tree_host()->WillBeginMainFrame(); |
| - layer_tree_host()->UpdateClientAnimations( |
| - begin_main_frame_state->monotonic_frame_begin_time); |
| + layer_tree_host()->BeginMainFrame(begin_main_frame_state->begin_frame_args); |
|
mithro-old
2014/08/11 07:33:33
Another Animate verses BeginMainFrame.
Here it se
Sami
2014/08/11 17:51:26
Yes, that's how I figured.
|
| layer_tree_host()->AnimateLayers( |
| - begin_main_frame_state->monotonic_frame_begin_time); |
| + begin_main_frame_state->begin_frame_args.frame_time); |
| blocked_main().last_monotonic_frame_begin_time = |
| - begin_main_frame_state->monotonic_frame_begin_time; |
| + begin_main_frame_state->begin_frame_args.frame_time; |
| // Unlink any backings that the impl thread has evicted, so that we know to |
| // re-paint them in UpdateLayers. |
| @@ -971,7 +970,7 @@ void ThreadProxy::ScheduledActionAnimate() { |
| if (!impl().animations_frozen_until_next_draw) { |
| impl().animation_time = |
| - impl().layer_tree_host_impl->CurrentFrameTimeTicks(); |
| + impl().layer_tree_host_impl->CurrentBeginFrameArgs().frame_time; |
| } |
| impl().layer_tree_host_impl->Animate(impl().animation_time); |
| impl().did_commit_after_animating = false; |