sync compositor: Send ipc reply in swap

content/renderer/android/synchronous_compositor_proxy.h

Index: content/renderer/android/synchronous_compositor_proxy.h
diff --git a/content/renderer/android/synchronous_compositor_proxy.h b/content/renderer/android/synchronous_compositor_proxy.h
index 2d26036cd1014de1ddc04c3a8d95a06e32f04e41..3db574df0b9d818fd016fde5824303b9a8a04eb0 100644
--- a/content/renderer/android/synchronous_compositor_proxy.h
+++ b/content/renderer/android/synchronous_compositor_proxy.h
@@ -66,6 +66,7 @@ class SynchronousCompositorProxy
 
   // SynchronousCompositorOutputSurfaceClient overrides.
   void Invalidate() override;
+  void SwapBuffers(cc::CompositorFrame* frame) override;
 
   void OnMessageReceived(const IPC::Message& message);
   bool Send(IPC::Message* message);
@@ -91,14 +92,15 @@ class SynchronousCompositorProxy
       SyncCompositorCommonRendererParams* common_renderer_params);
   void DemandDrawHw(const SyncCompositorCommonBrowserParams& common_params,
                     const SyncCompositorDemandDrawHwParams& params,
-                    SyncCompositorCommonRendererParams* common_renderer_params,
-                    cc::CompositorFrame* frame);
+                    IPC::Message* reply_message);
   void DemandDrawSw(const SyncCompositorCommonBrowserParams& common_params,
                     const SyncCompositorDemandDrawSwParams& params,
                     bool* result,
                     SyncCompositorCommonRendererParams* common_renderer_params,
                     cc::CompositorFrame* frame);
 
+  void SwapBuffersHw(cc::CompositorFrame* frame);
+  void SwapBuffersSw(cc::CompositorFrame* frame);
   void DidActivatePendingTree();
   void DeliverMessages();
   void SendAsyncRendererStateIfNeeded();
@@ -110,6 +112,8 @@ class SynchronousCompositorProxy
   ui::SynchronousInputHandlerProxy* const input_handler_proxy_;
   InputHandlerManagerClient::Handler* const input_handler_;
   bool inside_receive_;
+  IPC::Message* hardware_draw_reply_;
+  scoped_ptr<cc::CompositorFrame> software_frame_holder_;
 
   // From browser.
   size_t bytes_limit_;