Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index 0c0ff9ab0c9d12fcd1b95ca44d30968b79e578e2..d0415213b40f4b443d06e4804301d6c1a18b72ff 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -443,22 +443,20 @@ void ThreadProxy::OnSwapBuffersCompleteOnImplThread() { |
base::Bind(&ThreadProxy::DidCompleteSwapBuffers, main_thread_weak_ptr_)); |
} |
-void ThreadProxy::SetNeedsBeginImplFrame(bool enable) { |
- TRACE_EVENT1("cc", "ThreadProxy::SetNeedsBeginImplFrame", "enable", enable); |
+void ThreadProxy::SetNeedsBeginFrame(bool enable) { |
+ TRACE_EVENT1("cc", "ThreadProxy::SetNeedsBeginFrame", "enable", enable); |
DCHECK(IsImplThread()); |
- impl().layer_tree_host_impl->SetNeedsBeginImplFrame(enable); |
+ impl().layer_tree_host_impl->SetNeedsBeginFrame(enable); |
UpdateBackgroundAnimateTicking(); |
} |
-void ThreadProxy::BeginImplFrame(const BeginFrameArgs& args) { |
- TRACE_EVENT0("cc", "ThreadProxy::BeginImplFrame"); |
+void ThreadProxy::BeginFrame(const BeginFrameArgs& args) { |
DCHECK(IsImplThread()); |
+ impl().scheduler->BeginFrame(args); |
+} |
- // Sample the frame time now. This time will be used for updating animations |
- // when we draw. |
- impl().layer_tree_host_impl->UpdateCurrentFrameTime(); |
- |
- impl().scheduler->BeginImplFrame(args); |
+void ThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) { |
+ impl().layer_tree_host_impl->WillBeginImplFrame(args); |
} |
void ThreadProxy::OnCanDrawStateChanged(bool can_draw) { |
@@ -967,6 +965,7 @@ void ThreadProxy::BeginMainFrame( |
&completion, |
queue.release(), |
offscreen_context_provider)); |
+ |
completion.Wait(); |
RenderingStatsInstrumentation* stats_instrumentation = |
@@ -1529,7 +1528,7 @@ void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
layer_tree_host()->DeleteContentsTexturesOnImplThread( |
impl().layer_tree_host_impl->resource_provider()); |
impl().current_resource_update_controller.reset(); |
- impl().layer_tree_host_impl->SetNeedsBeginImplFrame(false); |
+ impl().layer_tree_host_impl->SetNeedsBeginFrame(false); |
impl().scheduler.reset(); |
impl().layer_tree_host_impl.reset(); |
impl().weak_factory.InvalidateWeakPtrs(); |