Revert of Cleanup viewport scrolling for future scroll customization work.

cc/layers/viewport.h

Index: cc/layers/viewport.h
diff --git a/cc/layers/viewport.h b/cc/layers/viewport.h
index 7a9234871ac89516c14688ce20bf91129bb182cb..01885d7774f73ec86c765a8d4f9d63298d9e79bd 100644
--- a/cc/layers/viewport.h
+++ b/cc/layers/viewport.h
@@ -25,6 +25,12 @@
   // determined.
   static const int kPinchZoomSnapMarginDips = 100;
 
+  struct ScrollResult {
+    gfx::Vector2dF applied_delta;
+    gfx::Vector2dF unused_scroll_delta;
+    gfx::Vector2dF top_controls_applied_delta;
+  };
+
   static scoped_ptr<Viewport> Create(LayerTreeHostImpl* host_impl);
 
   // Differs from scrolling in that only the visual viewport is moved, without
@@ -33,10 +39,10 @@
 
   // Scrolls the viewport, applying the unique bubbling between the inner and
   // outer viewport. Scrolls can be consumed by top controls.
-  gfx::Vector2dF ScrollBy(const gfx::Vector2dF& delta,
-                          const gfx::Point& viewport_point,
-                          bool is_direct_manipulation,
-                          bool affect_top_controls);
+  ScrollResult ScrollBy(const gfx::Vector2dF& delta,
+                        const gfx::Point& viewport_point,
+                        bool is_wheel_scroll,
+                        bool affect_top_controls);
 
   void PinchUpdate(float magnify_delta, const gfx::Point& anchor);
   void PinchEnd();