| 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 a07e7d814a2066d2dd2d2a94b5e4b2eca94544ac..3bb4692204ccb1afb889f7683e7b0cc14437b9f7 100644
|
| --- a/content/renderer/android/synchronous_compositor_proxy.h
|
| +++ b/content/renderer/android/synchronous_compositor_proxy.h
|
| @@ -52,7 +52,6 @@ class SynchronousCompositorProxy
|
| SynchronousCompositorProxy(
|
| int routing_id,
|
| IPC::Sender* sender,
|
| - SynchronousCompositorOutputSurface* output_surface,
|
| SynchronousCompositorExternalBeginFrameSource* begin_frame_source,
|
| ui::SynchronousInputHandlerProxy* input_handler_proxy,
|
| InputHandlerManagerClient::Handler* handler);
|
| @@ -75,6 +74,7 @@ class SynchronousCompositorProxy
|
| void SwapBuffers(uint32_t output_surface_id,
|
| cc::CompositorFrame* frame) override;
|
|
|
| + void SetOutputSurface(SynchronousCompositorOutputSurface* output_surface);
|
| void OnMessageReceived(const IPC::Message& message);
|
| bool Send(IPC::Message* message);
|
| void DidOverscroll(const DidOverscrollParams& did_overscroll_params);
|
| @@ -125,11 +125,11 @@ class SynchronousCompositorProxy
|
|
|
| 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_;
|
| const bool use_in_process_zero_copy_software_draw_;
|
| + SynchronousCompositorOutputSurface* output_surface_;
|
| bool inside_receive_;
|
| IPC::Message* hardware_draw_reply_;
|
| IPC::Message* software_draw_reply_;
|
|
|