Move compositor thread input handling logic into content

cc/input/input_handler.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_INPUT_INPUT_HANDLER_H_
 #define CC_INPUT_INPUT_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "cc/base/cc_export.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 
 namespace gfx {
 class Point;
 class PointF;
 class Vector2d;
 class Vector2dF;
 }
 
 namespace cc {
 
 class LayerScrollOffsetDelegate;
 
+class CC_EXPORT InputHandlerClient {
+ public:
+  virtual ~InputHandlerClient() {}
+
+  virtual void WillShutdown() = 0;
+  virtual void Animate(base::TimeTicks time) = 0;
+  virtual void MainThreadHasStoppedFlinging() = 0;
+
+ protected:
+  InputHandlerClient() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InputHandlerClient);
+};
+
 // The InputHandler is a way for the embedders to interact with the impl thread
 // side of the compositor implementation. There is one InputHandler per
 // LayerTreeHost. To use the input handler, implement the InputHanderClient
 // interface and bind it to the handler on the compositor thread.
 class CC_EXPORT InputHandler {
  public:
   enum ScrollStatus { ScrollOnMainThread, ScrollStarted, ScrollIgnored };
   enum ScrollInputType { Gesture, Wheel, NonBubblingGesture };
 
+  // Binds a client to this handler to receive notifications. Only one client
+  // can be bound to an InputHandler. The client must live at least until the
+  // handler calls WillShutdown() on the client.
+  virtual void BindToClient(InputHandlerClient* client) = 0;
+
   // Selects a layer to be scrolled at a given point in viewport (logical
   // pixel) coordinates. Returns ScrollStarted if the layer at the coordinates
   // can be scrolled, ScrollOnMainThread if the scroll event should instead be
   // delegated to the main thread, or ScrollIgnored if there is nothing to be
   // scrolled at the given coordinates.
   virtual ScrollStatus ScrollBegin(gfx::Point viewport_point,
                                    ScrollInputType type) = 0;
 
   // Scroll the selected layer starting at the given position. If the scroll
   // type given to ScrollBegin was a gesture, then the scroll point and delta
@@ skipping 50 matching lines @@
       base::TimeTicks frame_time) = 0;
 
  protected:
   InputHandler() {}
   virtual ~InputHandler() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputHandler);
 };
 
-class CC_EXPORT InputHandlerClient {
- public:
-  virtual ~InputHandlerClient() {}
-
-  virtual void BindToHandler(InputHandler* handler) = 0;
-  virtual void Animate(base::TimeTicks time) = 0;
-  virtual void MainThreadHasStoppedFlinging() = 0;
-
- protected:
-  InputHandlerClient() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(InputHandlerClient);
-};
-
 }  // namespace cc
 
 #endif  // CC_INPUT_INPUT_HANDLER_H_