Removed main-thread one dimensional scrolling paths.

third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp

 /*
  * Copyright (c) 2011, 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 63 matching lines @@
 {
     return (m_animationCurve || m_runState == RunState::WaitingToSendToCompositor)
         ? m_targetOffset : currentPosition();
 }
 
 bool ScrollAnimator::hasRunningAnimation() const
 {
     return (m_animationCurve || m_runState == RunState::WaitingToSendToCompositor);
 }
 
-float ScrollAnimator::computeDeltaToConsume(
-    ScrollbarOrientation orientation, float pixelDelta) const
+FloatSize ScrollAnimator::computeDeltaToConsume(const FloatSize& delta) const
 {
     FloatPoint pos = desiredTargetPosition();
-    float currentPos = (orientation == HorizontalScrollbar) ? pos.x() : pos.y();
-    float newPos = clampScrollPosition(orientation, currentPos + pixelDelta);
-    return (currentPos == newPos) ? 0.0f : (newPos - currentPos);
+    FloatPoint newPos = toFloatPoint(m_scrollableArea->clampScrollPosition(pos + delta));
+    return newPos - pos;
 }
 
 void ScrollAnimator::resetAnimationState()
 {
     ScrollAnimatorCompositorCoordinator::resetAnimationState();
     if (m_animationCurve)
         m_animationCurve.clear();
     m_startTime = 0.0;
 }
 
-ScrollResultOneDimensional ScrollAnimator::userScroll(
-    ScrollbarOrientation orientation, ScrollGranularity granularity, float delta)
+ScrollResult ScrollAnimator::userScroll(
+    ScrollGranularity granularity, const FloatSize& delta)
 {
     if (!m_scrollableArea->scrollAnimatorEnabled())
-        return ScrollAnimatorBase::userScroll(orientation, granularity, delta);
+        return ScrollAnimatorBase::userScroll(granularity, delta);
 
     TRACE_EVENT0("blink", "ScrollAnimator::scroll");
 
     if (granularity == ScrollByPrecisePixel) {
         // Cancel scroll animation because asked to instant scroll.
         if (hasRunningAnimation())
             cancelAnimation();
-        return ScrollAnimatorBase::userScroll(orientation, granularity, delta);
+        return ScrollAnimatorBase::userScroll(granularity, delta);
     }
 
-    float usedDelta = computeDeltaToConsume(orientation, delta);
-    FloatPoint pixelDelta = (orientation == VerticalScrollbar
-        ? FloatPoint(0, usedDelta) : FloatPoint(usedDelta, 0));
+    FloatSize usedDelta = computeDeltaToConsume(delta);
 
     FloatPoint targetPos = desiredTargetPosition();
-    targetPos.moveBy(pixelDelta);
+    targetPos.move(usedDelta);
 
     if (m_runState == RunState::PostAnimationCleanup)
         resetAnimationState();
 
     if (m_animationCurve && m_runState != RunState::WaitingToCancelOnCompositor) {
         if ((targetPos - m_targetOffset).isZero()) {
             // Report unused delta only if there is no animation running. See
             // comment below regarding scroll latching.
-            return ScrollResultOneDimensional(/* didScroll */ true, /* unusedScrollDelta */ 0);
+            // TODO(bokan): Need to standardize and document semantics of
+            // scroll results on animated scrolls. ScrollAnimator currently
+            // differs from ScrollAnimatorMac.
+            return ScrollResult(true, true, 0, 0);
         }
 
         m_targetOffset = targetPos;
         ASSERT(m_runState == RunState::RunningOnMainThread
             || m_runState == RunState::RunningOnCompositor
             || m_runState == RunState::RunningOnCompositorButNeedsUpdate);
 
         if (m_runState == RunState::RunningOnCompositor
             || m_runState == RunState::RunningOnCompositorButNeedsUpdate) {
             if (registerAndScheduleAnimation())
                 m_runState = RunState::RunningOnCompositorButNeedsUpdate;
-            return ScrollResultOneDimensional(/* didScroll */ true, /* unusedScrollDelta */ 0);
+            return ScrollResult(true, true, 0, 0);
         }
 
         // Running on the main thread, simply update the target offset instead
         // of sending to the compositor.
         m_animationCurve->updateTarget(m_timeFunction() - m_startTime, targetPos);
-        return ScrollResultOneDimensional(/* didScroll */ true, /* unusedScrollDelta */ 0);
+        return ScrollResult(true, true, 0, 0);
     }
 
     if ((targetPos - currentPosition()).isZero()) {
         // Report unused delta only if there is no animation and we are not
         // starting one. This ensures we latch for the duration of the
         // animation rather than animating multiple scrollers at the same time.
-        return ScrollResultOneDimensional(/* didScroll */ false, delta);
+        return ScrollResult(false, false, delta.width(), delta.height());
     }
 
     m_targetOffset = targetPos;
     m_startTime = m_timeFunction();
     m_lastGranularity = granularity;
 
     if (registerAndScheduleAnimation())
         m_runState = RunState::WaitingToSendToCompositor;
 
-    return ScrollResultOneDimensional(/* didScroll */ true, /* unusedScrollDelta */ 0);
+    return ScrollResult(true, true, 0, 0);
 }
 
 void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 {
-    m_currentPosX = offset.x();
-    m_currentPosY = offset.y();
+    m_currentPos = offset;
 
     resetAnimationState();
     notifyPositionChanged();
 }
 
 void ScrollAnimator::tickAnimation(double monotonicTime)
 {
     if (m_runState != RunState::RunningOnMainThread)
         return;
 
     TRACE_EVENT0("blink", "ScrollAnimator::tickAnimation");
     double elapsedTime = monotonicTime - m_startTime;
 
     bool isFinished = (elapsedTime > m_animationCurve->duration());
     FloatPoint offset = isFinished ? m_animationCurve->targetValue()
         : m_animationCurve->getValue(elapsedTime);
 
     offset = FloatPoint(m_scrollableArea->clampScrollPosition(offset));
 
-    m_currentPosX = offset.x();
-    m_currentPosY = offset.y();
+    m_currentPos = offset;
 
     if (isFinished)
         m_runState = RunState::PostAnimationCleanup;
     else
         scrollableArea()->scheduleAnimation();
 
     TRACE_EVENT0("blink", "ScrollAnimator::notifyPositionChanged");
     notifyPositionChanged();
 }
 
@@ skipping 147 matching lines @@
     }
     return true;
 }
 
 DEFINE_TRACE(ScrollAnimator)
 {
     ScrollAnimatorBase::trace(visitor);
 }
 
 } // namespace blink