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 3659ca01d28148cbd7a0e190beac55ab88441362..8b167205005b5c5e5584771115a187612dbf890e 100644 |
--- a/content/browser/android/in_process/synchronous_compositor_impl.h |
+++ b/content/browser/android/in_process/synchronous_compositor_impl.h |
@@ -8,11 +8,13 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
+#include "cc/input/layer_scroll_offset_delegate.h" |
#include "content/browser/android/in_process/synchronous_compositor_output_surface.h" |
#include "content/public/browser/android/synchronous_compositor.h" |
#include "content/public/browser/web_contents_user_data.h" |
namespace content { |
+class InputHandlerManager; |
// The purpose of this class is to act as the intermediary between the various |
// components that make up the 'synchronous compositor mode' implementation and |
@@ -20,7 +22,8 @@ namespace content { |
// This class is created on the main thread but most of the APIs are called |
// from the Compositor thread. |
class SynchronousCompositorImpl |
- : public SynchronousCompositor, |
+ : public cc::LayerScrollOffsetDelegate, |
+ public SynchronousCompositor, |
public SynchronousCompositorOutputSurfaceDelegate, |
public WebContentsUserData<SynchronousCompositorImpl> { |
public: |
@@ -43,6 +46,10 @@ class SynchronousCompositorImpl |
SynchronousCompositorOutputSurface* output_surface) OVERRIDE; |
virtual void SetContinuousInvalidate(bool enable) OVERRIDE; |
+ // LayerScrollOffsetDelegate |
+ virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE; |
+ virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE; |
+ |
private: |
explicit SynchronousCompositorImpl(WebContents* contents); |
virtual ~SynchronousCompositorImpl(); |
@@ -56,6 +63,7 @@ class SynchronousCompositorImpl |
SynchronousCompositorClient* compositor_client_; |
SynchronousCompositorOutputSurface* output_surface_; |
WebContents* contents_; |
+ InputHandlerManager* input_handler_manager_; |
DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl); |
}; |