cc: Remove OutputSurfaceClient::DidSwapBuffers().

content/renderer/android/synchronous_compositor_output_surface.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/android/synchronous_compositor_output_surface.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 180 matching lines @@
 }
 
 static void NoOpDrawCallback(cc::SurfaceDrawStatus s) {}
 
 void SynchronousCompositorOutputSurface::SwapBuffers(
     cc::CompositorFrame frame) {
   DCHECK(CalledOnValidThread());
   DCHECK(sync_client_);
 
   if (fallback_tick_running_) {
-    client_->DidSwapBuffers();
-    client_->DidSwapBuffersComplete();
     DCHECK(frame.delegated_frame_data->resource_list.empty());
     cc::ReturnedResourceArray return_resources;
     ReturnResources(return_resources);
+    did_swap_ = true;
     return;
   }
 
   cc::CompositorFrame swap_frame;
 
   if (in_software_draw_) {
     // The frame we send to the client is actually just the metadata. Preserve
     // the |frame| for the software path below.
     swap_frame.metadata = frame.metadata.Clone();
 
@@ skipping 13 matching lines @@
         delegated_surface_id_, std::move(frame), base::Bind(&NoOpDrawCallback));
     display_->DrawAndSwap();
   } else {
     // For hardware draws we send the whole frame to the client so it can draw
     // the content in it.
     swap_frame = std::move(frame);
   }
 
   sync_client_->SwapBuffers(output_surface_id_, std::move(swap_frame));
   DeliverMessages();
-  client_->DidSwapBuffers();
   did_swap_ = true;
 }
 
 void SynchronousCompositorOutputSurface::CancelFallbackTick() {
   fallback_tick_.Cancel();
   fallback_tick_pending_ = false;
 }
 
 void SynchronousCompositorOutputSurface::FallbackTickFired() {
   DCHECK(CalledOnValidThread());
@@ skipping 76 matching lines @@
 
 void SynchronousCompositorOutputSurface::InvokeComposite(
     const gfx::Transform& transform,
     const gfx::Rect& viewport,
     const gfx::Rect& clip) {
   gfx::Transform adjusted_transform = transform;
   adjusted_transform.matrix().postTranslate(-viewport.x(), -viewport.y(), 0);
   did_swap_ = false;
   client_->OnDraw(adjusted_transform, viewport, clip, in_software_draw_);
 
-  if (did_swap_)
+  if (did_swap_) {
+    // This must happen after unwinding the stack and leaving the compositor.
+    // Usually it is a separate task but we just defer it until OnDraw completes
+    // instead.
     client_->DidSwapBuffersComplete();
+  }
 }
 
 void SynchronousCompositorOutputSurface::OnReclaimResources(
     uint32_t output_surface_id,
     const cc::CompositorFrameAck& ack) {
   // Ignore message if it's a stale one coming from a different output surface
   // (e.g. after a lost context).
   if (output_surface_id != output_surface_id_)
     return;
   ReclaimResources(&ack);
@@ skipping 54 matching lines @@
   client_->ReclaimResources(&ack);
 }
 
 void SynchronousCompositorOutputSurface::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Software output is synchronous and doesn't use a BeginFrameSource.
   NOTREACHED();
 }
 
 }  // namespace content