| 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..6ec46f0f3820abe03bf4097ee880b91307cd22f8 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,14 @@ class SynchronousCompositorImpl
|
|
|
| InputEventAckState HandleInputEvent(const blink::WebInputEvent& input_event);
|
|
|
| + scoped_ptr<cc::BeginFrameSource> GetExternalBeginFrameSource();
|
| +
|
| + bool IsInvokingComposite() const;
|
| +
|
| + SynchronousCompositorOutputSurface* output_surface() const {
|
| + return output_surface_;
|
| + }
|
| +
|
| // SynchronousCompositor
|
| virtual void SetClient(SynchronousCompositorClient* compositor_client)
|
| override;
|
| @@ -72,8 +82,9 @@ class SynchronousCompositorImpl
|
| SynchronousCompositorOutputSurface* output_surface) override;
|
| virtual void DidDestroySynchronousOutputSurface(
|
| SynchronousCompositorOutputSurface* output_surface) override;
|
| - virtual void SetContinuousInvalidate(bool enable) override;
|
| + virtual void UpdateContinuousInvalidate() override;
|
| virtual void DidActivatePendingTree() override;
|
| + virtual void BeginFrame() override;
|
|
|
| // LayerScrollOffsetDelegate
|
| virtual gfx::ScrollOffset GetTotalScrollOffset() override;
|
| @@ -101,6 +112,7 @@ class SynchronousCompositorImpl
|
|
|
| SynchronousCompositorClient* compositor_client_;
|
| SynchronousCompositorOutputSurface* output_surface_;
|
| + SynchronousCompositorExternalBeginFrameSource* begin_frame_source_;
|
| WebContents* contents_;
|
| cc::InputHandler* input_handler_;
|
|
|
|
|