1 files changed, 16 insertions, 16 deletions

diff --git a/chromium/content/browser/renderer_host/overscroll_controller.h b/chromium/content/browser/renderer_host/overscroll_controller.h
index fab531947ee..c68eb9b1573 100644
--- a/chromium/content/browser/renderer_host/overscroll_controller.h
+++ b/chromium/content/browser/renderer_host/overscroll_controller.h
@@ -17,7 +17,6 @@ namespace content {
 
 class MockRenderWidgetHost;
 class OverscrollControllerDelegate;
-class RenderWidgetHostImpl;
 
 // Indicates the direction that the scroll is heading in relative to the screen,
 // with the top being NORTH.
@@ -36,25 +35,29 @@ enum OverscrollMode {
 // status accordingly.
 class OverscrollController {
  public:
-  // Creates an overscroll controller for the specified RenderWidgetHost.
-  // The RenderWidgetHost owns this overscroll controller.
-  explicit OverscrollController(RenderWidgetHostImpl* widget_host);
+  OverscrollController();
   virtual ~OverscrollController();
 
+  // The result of |DispatchEvent()|, indicating either how the event was
+  // handled, or how it should be handled by the caller.
+  enum Disposition {
+    CONSUMED,
+    SHOULD_FORWARD_TO_RENDERER,
+    SHOULD_FORWARD_TO_GESTURE_FILTER
+  };
   // This must be called when dispatching any event from the
   // RenderWidgetHostView so that the state of the overscroll gesture can be
   // updated properly.
-  // Returns true if the event should be dispatched, false otherwise.
-  bool WillDispatchEvent(const WebKit::WebInputEvent& event,
-                         const ui::LatencyInfo& latency_info);
+  Disposition DispatchEvent(const blink::WebInputEvent& event,
+                            const ui::LatencyInfo& latency_info);
 
   // This must be called when the ACK for any event comes in. This updates the
   // overscroll gesture status as appropriate.
-  void ReceivedEventACK(const WebKit::WebInputEvent& event, bool processed);
+  void ReceivedEventACK(const blink::WebInputEvent& event, bool processed);
 
   // This must be called when a gesture event is filtered out and not sent to
   // the renderer.
-  void DiscardingGestureEvent(const WebKit::WebGestureEvent& event);
+  void DiscardingGestureEvent(const blink::WebGestureEvent& event);
 
   OverscrollMode overscroll_mode() const { return overscroll_mode_; }
 
@@ -83,22 +86,22 @@ class OverscrollController {
   // Returns true if the event indicates that the in-progress overscroll gesture
   // can now be completed.
   bool DispatchEventCompletesAction(
-      const WebKit::WebInputEvent& event) const;
+      const blink::WebInputEvent& event) const;
 
   // Returns true to indicate that dispatching the event should reset the
   // overscroll gesture status.
-  bool DispatchEventResetsState(const WebKit::WebInputEvent& event) const;
+  bool DispatchEventResetsState(const blink::WebInputEvent& event) const;
 
   // Processes an event to update the internal state for overscroll. Returns
   // true if the state is updated, false otherwise.
-  bool ProcessEventForOverscroll(const WebKit::WebInputEvent& event);
+  bool ProcessEventForOverscroll(const blink::WebInputEvent& event);
 
   // Processes horizontal overscroll. This can update both the overscroll mode
   // and the over scroll amount (i.e. |overscroll_mode_|, |overscroll_delta_x_|
   // and |overscroll_delta_y_|).
   void ProcessOverscroll(float delta_x,
                          float delta_y,
-                         WebKit::WebInputEvent::Type event_type);
+                         blink::WebInputEvent::Type event_type);
 
   // Completes the desired action from the current gesture.
   void CompleteAction();
@@ -107,9 +110,6 @@ class OverscrollController {
   // appropriate).
   void SetOverscrollMode(OverscrollMode new_mode);
 
-  // The RenderWidgetHost that owns this overscroll controller.
-  RenderWidgetHostImpl* render_widget_host_;
-
   // The current state of overscroll gesture.
   OverscrollMode overscroll_mode_;