sync compositor: Send ipc reply in swap

content/renderer/android/synchronous_compositor_proxy.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 48 matching lines @@
                             const gfx::SizeF& scrollable_size,
                             float page_scale_factor,
                             float min_page_scale_factor,
                             float max_page_scale_factor) override;
 
   // SynchronousCompositorExternalBeginFrameSourceClient overrides.
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
 
   // SynchronousCompositorOutputSurfaceClient overrides.
   void Invalidate() override;
+  void SwapBuffers(cc::CompositorFrame* frame) override;
 
   void OnMessageReceived(const IPC::Message& message);
   bool Send(IPC::Message* message);
   void DidOverscroll(const DidOverscrollParams& did_overscroll_params);
 
  private:
   void ProcessCommonParams(
       const SyncCompositorCommonBrowserParams& common_params);
   void PopulateCommonParams(SyncCompositorCommonRendererParams* params);
 
   // IPC handlers.
   void HandleInputEvent(
       const SyncCompositorCommonBrowserParams& common_params,
       const blink::WebInputEvent* event,
       SyncCompositorCommonRendererParams* common_renderer_params,
       InputEventAckState* ack);
   void BeginFrame(const SyncCompositorCommonBrowserParams& common_params,
                   const cc::BeginFrameArgs& args,
                   SyncCompositorCommonRendererParams* common_renderer_params);
   void OnComputeScroll(
       const SyncCompositorCommonBrowserParams& common_params,
       base::TimeTicks animation_time,
       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();
 
   const int routing_id_;
   IPC::Sender* const sender_;
   SynchronousCompositorOutputSurface* const output_surface_;
   SynchronousCompositorExternalBeginFrameSource* const begin_frame_source_;
   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_;
 
   uint32_t version_;
   gfx::ScrollOffset total_scroll_offset_;  // Modified by both.
   gfx::ScrollOffset max_scroll_offset_;
   gfx::SizeF scrollable_size_;
   float page_scale_factor_;
   float min_page_scale_factor_;
   float max_page_scale_factor_;
   bool need_animate_scroll_;
   bool need_invalidate_;
   bool need_begin_frame_;
   bool did_activate_pending_tree_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_