| Index: ui/compositor/compositor.h
|
| diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
|
| index 05c3bcc93eca5df31894d4ea2df99eb154cc043a..cb5a740a72dd91604e92ba9d258f1afd940ff8a6 100644
|
| --- a/ui/compositor/compositor.h
|
| +++ b/ui/compositor/compositor.h
|
| @@ -51,6 +51,7 @@ class TaskGraphRunner;
|
|
|
| namespace gfx {
|
| class Rect;
|
| +class ScrollOffset;
|
| class Size;
|
| }
|
|
|
| @@ -66,6 +67,7 @@ class CompositorVSyncManager;
|
| class LatencyInfo;
|
| class Layer;
|
| class Reflector;
|
| +class UIScrollInputManager;
|
| class Texture;
|
|
|
| const int kCompositorLockTimeoutMs = 67;
|
| @@ -353,6 +355,12 @@ class COMPOSITOR_EXPORT Compositor
|
| return surface_id_allocator_.get();
|
| }
|
|
|
| + UIScrollInputManager* scroll_input_manager() {
|
| + return scroll_input_manager_.get();
|
| + }
|
| +
|
| + bool ScrollLayerTo(int layer_id, const gfx::ScrollOffset& offset);
|
| +
|
| private:
|
| friend class base::RefCounted<Compositor>;
|
| friend class CompositorLock;
|
| @@ -394,6 +402,8 @@ class COMPOSITOR_EXPORT Compositor
|
| LayerAnimatorCollection layer_animator_collection_;
|
| scoped_refptr<cc::AnimationTimeline> animation_timeline_;
|
|
|
| + std::unique_ptr<UIScrollInputManager> scroll_input_manager_;
|
| +
|
| base::WeakPtrFactory<Compositor> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Compositor);
|
|
|