Unified OutputSurface::SwapBuffers.

cc/trees/layer_tree_host_impl.cc

Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index ccd69d2ea14e53fa16ac3616a0632d1d3ec1c030..653a2217338efba4c0578f204a3a02ee116b5871 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -928,8 +928,6 @@ bool LayerTreeHostImpl::PrepareToDraw(FrameData* frame,
   if (!CalculateRenderPasses(frame))
     return false;
 
-  frame->latency_info = active_tree_->GetLatencyInfo();
-
   // If we return true, then we expect DrawLayers() to be called before this
   // function is called again.
   return true;
@@ -1063,17 +1061,14 @@ void LayerTreeHostImpl::BeginFrame(base::TimeTicks frame_time) {
   client_->BeginFrameOnImplThread(frame_time);
 }
 
-void LayerTreeHostImpl::OnSendFrameToParentCompositorAck(
-    const CompositorFrameAck& ack) {
-  if (!renderer_)
-    return;
-
+void LayerTreeHostImpl::OnSwapBuffersComplete(
+    const CompositorFrameAck* ack) {
   // TODO(piman): We may need to do some validation on this ack before
   // processing it.
-  renderer_->ReceiveCompositorFrameAck(ack);
+  if (ack && renderer_)
+    renderer_->ReceiveSwapBuffersAck(*ack);
 
-  // When using compositor frame data, the ack doubles as a swap complete ack.
-  OnSwapBuffersComplete();
+  client_->OnSwapBuffersCompleteOnImplThread();
 }
 
 void LayerTreeHostImpl::OnCanDrawStateChangedForTree() {
@@ -1225,7 +1220,7 @@ const RendererCapabilities& LayerTreeHostImpl::GetRendererCapabilities() const {
 bool LayerTreeHostImpl::SwapBuffers(const LayerTreeHostImpl::FrameData& frame) {
   if (frame.has_no_damage)
     return false;
-  renderer_->SwapBuffers(frame.latency_info);
+  renderer_->SwapBuffers();
   active_tree_->ClearLatencyInfo();

[piman, 2013/06/10 19:52:25]

Here as well, is there any potential trouble if we call OnSwapBuffersComplete
re-entrantly from SwapBuffers() ?

   return true;
 }
@@ -1268,10 +1263,6 @@ void LayerTreeHostImpl::DidLoseOutputSurface() {
     client_->DidLoseOutputSurfaceOnImplThread();
 }
 
-void LayerTreeHostImpl::OnSwapBuffersComplete() {
-  client_->OnSwapBuffersCompleteOnImplThread();
-}
-
 void LayerTreeHostImpl::Readback(void* pixels,
                                  gfx::Rect rect_in_device_viewport) {
   DCHECK(renderer_);
@@ -1478,7 +1469,7 @@ bool LayerTreeHostImpl::DoInitializeRenderer(
     if (!resource_provider)
       return false;
 
-    if (output_surface->capabilities().has_parent_compositor) {
+    if (output_surface->capabilities().delegated_rendering) {
       renderer_ = DelegatingRenderer::Create(this, output_surface.get(),
                                              resource_provider.get());
     } else if (output_surface->context3d()) {