Chromium Code Reviews| Index: content/browser/android/in_process/synchronous_compositor_impl.h |
| diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h |
| index 03d27969c37130ff93d18987d6f69d8f9d0eb33b..2405de9be0c7f7cff63a9af10d37fe120843cdf9 100644 |
| --- a/content/browser/android/in_process/synchronous_compositor_impl.h |
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.h |
| @@ -18,6 +18,7 @@ |
| #include "ipc/ipc_message.h" |
| namespace cc { |
| +class BeginFrameSource; |
| class InputHandler; |
| } |
| @@ -27,6 +28,7 @@ class WebInputEvent; |
| namespace content { |
| class InputHandlerManager; |
| +class SynchronousCompositorExternalBeginFrameSource; |
| struct DidOverscrollParams; |
| // The purpose of this class is to act as the intermediary between the various |
| @@ -48,6 +50,17 @@ class SynchronousCompositorImpl |
| InputEventAckState HandleInputEvent(const blink::WebInputEvent& input_event); |
| + void SetExternalBeginFrameSource( |
|
boliu
2014/10/24 17:42:41
nit: Group methods called by FrameSource together,
simonhong
2014/10/29 14:47:13
Done.
|
| + SynchronousCompositorExternalBeginFrameSource* begin_frame_source); |
| + |
| + void SetContinuousInvalidate(bool needs_begin_frames) const; |
| + |
| + bool invoking_composite() const { return invoking_composite_; } |
| + |
| + SynchronousCompositorOutputSurface* output_surface() const { |
|
boliu
2014/10/24 17:42:41
not used, remove
simonhong
2014/10/29 14:47:13
Done.
|
| + return output_surface_; |
| + } |
| + |
| // SynchronousCompositor |
| virtual void SetClient(SynchronousCompositorClient* compositor_client) |
| override; |
| @@ -72,8 +85,8 @@ class SynchronousCompositorImpl |
| SynchronousCompositorOutputSurface* output_surface) override; |
| virtual void DidDestroySynchronousOutputSurface( |
| SynchronousCompositorOutputSurface* output_surface) override; |
| - virtual void SetContinuousInvalidate(bool enable) override; |
| virtual void DidActivatePendingTree() override; |
| + virtual void RequestBeginFrame() override; |
| // LayerScrollOffsetDelegate |
| virtual gfx::ScrollOffset GetTotalScrollOffset() override; |
| @@ -97,12 +110,15 @@ class SynchronousCompositorImpl |
| void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_info); |
| void DeliverMessages(); |
| + void BeginFrame() const; |
|
boliu
2014/10/24 17:42:41
Not called or defined. Remove
simonhong
2014/10/29 14:47:13
Done.
|
| bool CalledOnValidThread() const; |
| SynchronousCompositorClient* compositor_client_; |
| SynchronousCompositorOutputSurface* output_surface_; |
| + SynchronousCompositorExternalBeginFrameSource* begin_frame_source_; |
| WebContents* contents_; |
| cc::InputHandler* input_handler_; |
| + bool invoking_composite_; |
| base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_; |