Removed main-thread one dimensional scrolling paths.

third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 class Scrollbar;
 
 class PLATFORM_EXPORT ScrollAnimatorBase : public ScrollAnimatorCompositorCoordinator {
 public:
     static PassOwnPtrWillBeRawPtr<ScrollAnimatorBase> create(ScrollableArea*);
 
     virtual ~ScrollAnimatorBase();
 
     virtual void dispose() { }
 
-    // Computes a scroll destination for the given parameters.  The returned
-    // ScrollResultOneDimensional will have didScroll set to false if already at
-    // the destination.  Otherwise, starts scrolling towards the destination and
-    // didScroll is true.  Scrolling may be immediate or animated. The base
-    // class implementation always scrolls immediately, never animates.
-    virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float delta);
+    // A possibly animated scroll. The base class implementation always scrolls
+    // immediately, never animates. If the scroll is animated and currently the
+    // animator has an in-progress animation, the ScrollResult will always return
+    // no unusedDelta and didScroll=true, i.e. fully consuming the scroll request.
+    // This makes animations latch to a single scroller. Note, the semantics are
+    // currently somewhat different on Mac - see ScrollAnimatorMac.mm.
+    virtual ScrollResult userScroll(ScrollGranularity, const FloatSize& delta);
 
     virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);
 
 #if OS(MACOSX)
     virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
 #endif
 
     void setCurrentPosition(const FloatPoint&);
     FloatPoint currentPosition() const;
     virtual FloatPoint desiredTargetPosition() const { return currentPosition(); }
 
     // Returns how much of pixelDelta will be used by the underlying scrollable
     // area.
-    virtual float computeDeltaToConsume(ScrollbarOrientation, float pixelDelta) const;
+    virtual FloatSize computeDeltaToConsume(const FloatSize& delta) const;
 
 
     // ScrollAnimatorCompositorCoordinator implementation.
     ScrollableArea* scrollableArea() const override { return m_scrollableArea; }
     void tickAnimation(double monotonicTime) override { };
     void cancelAnimation() override { }
     void updateCompositorAnimations() override { };
     void notifyCompositorAnimationFinished(int groupId) override { };
     void notifyCompositorAnimationAborted(int groupId) override { };
     void layerForCompositedScrollingDidChange(CompositorAnimationTimeline*) override { };
@@ skipping 24 matching lines @@
 
     virtual bool setScrollbarsVisibleForTesting(bool) { return false; }
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     explicit ScrollAnimatorBase(ScrollableArea*);
 
     virtual void notifyPositionChanged();
 
-    float clampScrollPosition(ScrollbarOrientation, float) const;
+    RawPtrWillBeMember<ScrollableArea> m_scrollableArea;
 
-    RawPtrWillBeMember<ScrollableArea> m_scrollableArea;
-    float m_currentPosX; // We avoid using a FloatPoint in order to reduce
-    float m_currentPosY; // subclass code complexity.
+    FloatPoint m_currentPos;
 };
 
 } // namespace blink
 
 #endif // ScrollAnimatorBase_h