Index: cc/trees/single_thread_proxy.cc |
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc |
index 6ac3ae14b92b7e691cad806110e15b4ad66fc64d..be43f116847711eac95d966efb4aa37d7ad24c39 100644 |
--- a/cc/trees/single_thread_proxy.cc |
+++ b/cc/trees/single_thread_proxy.cc |
@@ -420,12 +420,12 @@ void SingleThreadProxy::SetBeginFrameSource(BeginFrameSource* source) { |
scheduler_on_impl_thread_->SetBeginFrameSource(source); |
} |
-void SingleThreadProxy::DidSwapBuffersCompleteOnImplThread() { |
+void SingleThreadProxy::DidReceiveCompositorFrameAckOnImplThread() { |
TRACE_EVENT0("cc,benchmark", |
- "SingleThreadProxy::DidSwapBuffersCompleteOnImplThread"); |
+ "SingleThreadProxy::DidReceiveCompositorFrameAckOnImplThread"); |
if (scheduler_on_impl_thread_) |
- scheduler_on_impl_thread_->DidSwapBuffersComplete(); |
- layer_tree_host_->DidCompleteSwapBuffers(); |
+ scheduler_on_impl_thread_->DidReceiveCompositorFrameAck(); |
+ layer_tree_host_->DidReceiveCompositorFrameAck(); |
} |
void SingleThreadProxy::OnDrawForCompositorFrameSink( |
@@ -550,7 +550,7 @@ DrawResult SingleThreadProxy::DoComposite(LayerTreeHostImpl::FrameData* frame) { |
if (draw_frame) { |
if (layer_tree_host_impl_->DrawLayers(frame)) { |
if (scheduler_on_impl_thread_) |
- scheduler_on_impl_thread_->DidSwapBuffers(); |
+ scheduler_on_impl_thread_->DidSubmitCompositorFrame(); |
client_->DidPostSwapBuffers(); |
sunnyps
2016/10/11 18:32:49
Should DidPostSwapBuffers also be renamed?
danakj
2016/10/13 23:50:22
Yes, ok I kept going and renamed this and that hit
|
} |
} |
@@ -688,13 +688,13 @@ void SingleThreadProxy::BeginMainFrameAbortedOnImplThread( |
scheduler_on_impl_thread_->BeginMainFrameAborted(reason); |
} |
-DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapIfPossible() { |
+DrawResult SingleThreadProxy::ScheduledActionSubmitCompositorFrameIfPossible() { |
DebugScopedSetImplThread impl(task_runner_provider_); |
LayerTreeHostImpl::FrameData frame; |
return DoComposite(&frame); |
} |
-DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapForced() { |
+DrawResult SingleThreadProxy::ScheduledActionSubmitCompositorFrameForced() { |
NOTREACHED(); |
return INVALID_RESULT; |
} |