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 6058aad9adcfd164550c3ba093a36da7a1b8ecb0..bc04d77d6a24c8895352bc371f45a64aecc7bea6 100644 |
--- a/content/renderer/android/synchronous_compositor_proxy.h |
+++ b/content/renderer/android/synchronous_compositor_proxy.h |
@@ -73,8 +73,9 @@ class SynchronousCompositorProxy |
// IPC handlers. |
void PopulateCommonParams(SyncCompositorCommonRendererParams* params) const; |
void OnComputeScroll(base::TimeTicks animation_time); |
- void DemandDrawHw(const SyncCompositorDemandDrawHwParams& params, |
- IPC::Message* reply_message); |
+ void DemandDrawHw(const SyncCompositorDemandDrawHwParams& params); |
+ void DemandDrawHw_Sync(const SyncCompositorDemandDrawHwParams& params, |
+ IPC::Message* reply_message); |
void SetSharedMemory( |
const SyncCompositorSetSharedMemoryParams& params, |
bool* success, |
@@ -88,10 +89,14 @@ class SynchronousCompositorProxy |
SyncCompositorCommonRendererParams* common_renderer_params); |
void SetScroll(const gfx::ScrollOffset& total_scroll_offset); |
+ void SwapBuffersHw_Sync(uint32_t output_surface_id, |
+ cc::CompositorFrame frame); |
void SwapBuffersHw(uint32_t output_surface_id, cc::CompositorFrame frame); |
+ void SendDemandDrawHwReply_Sync(cc::CompositorFrame frame, |
+ uint32_t output_surface_id, |
+ IPC::Message* reply_message); |
void SendDemandDrawHwReply(cc::CompositorFrame frame, |
- uint32_t output_surface_id, |
- IPC::Message* reply_message); |
+ uint32_t output_surface_id); |
void DoDemandDrawSw(const SyncCompositorDemandDrawSwParams& params); |
void SwapBuffersSw(cc::CompositorFrame frame); |
void SendDemandDrawSwReply(bool success, |
@@ -107,6 +112,7 @@ class SynchronousCompositorProxy |
bool inside_receive_; |
IPC::Message* hardware_draw_reply_; |
IPC::Message* software_draw_reply_; |
+ bool hardware_draw_reply_async_; |
// From browser. |
std::unique_ptr<SharedMemoryWithSize> software_draw_shm_; |