| Index: cc/CCInputHandler.h
|
| diff --git a/cc/CCInputHandler.h b/cc/CCInputHandler.h
|
| index db0cbf653548cd5f6efa4ef1db48a8580720c3ea..9ffe5c7770e3f0de34fb15ea99cd37416772425f 100644
|
| --- a/cc/CCInputHandler.h
|
| +++ b/cc/CCInputHandler.h
|
| @@ -10,8 +10,6 @@
|
|
|
| namespace WebCore {
|
|
|
| -class CCActiveGestureAnimation;
|
| -class CCGestureCurveTarget;
|
| class IntPoint;
|
| class IntSize;
|
|
|
| @@ -19,9 +17,9 @@ class IntSize;
|
| // the impl thread side of the compositor implementation.
|
| //
|
| // There is one CCInputHandler for every CCLayerTreeHost. It is
|
| -// created and used only on the impl thread.
|
| +// created on the main thread and used only on the impl thread.
|
| //
|
| -// The CCInputHandler is constructed with an InputHandlerClient, which is the
|
| +// The CCInputHandler is constructed with a CCInputHandlerClient, which is the
|
| // interface by which the handler can manipulate the LayerTree.
|
| class CCInputHandlerClient {
|
| WTF_MAKE_NONCOPYABLE(CCInputHandlerClient);
|
| @@ -56,9 +54,6 @@ public:
|
| double startTime,
|
| double duration) = 0;
|
|
|
| - virtual CCActiveGestureAnimation* activeGestureAnimation() = 0;
|
| - virtual void setActiveGestureAnimation(PassOwnPtr<CCActiveGestureAnimation>) = 0;
|
| -
|
| // Request another callback to CCInputHandler::animate().
|
| virtual void scheduleAnimation() = 0;
|
|
|
| @@ -70,10 +65,9 @@ protected:
|
| class CCInputHandler {
|
| WTF_MAKE_NONCOPYABLE(CCInputHandler);
|
| public:
|
| - static PassOwnPtr<CCInputHandler> create(CCInputHandlerClient*);
|
| virtual ~CCInputHandler() { }
|
|
|
| - virtual int identifier() const = 0;
|
| + virtual void bindToClient(CCInputHandlerClient*) = 0;
|
| virtual void animate(double monotonicTime) = 0;
|
|
|
| protected:
|
|
|