Removed main-thread one dimensional scrolling paths.

third_party/WebKit/Source/core/frame/LocalFrame.cpp

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index ca6138a5f3195193be584c02d755ce9afc4cb229..fb0aa87adef798f03c8b2f9c85d052fb43fc8a00 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -764,13 +764,6 @@ void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words)
     spellChecker().removeSpellingMarkersUnderWords(words);
 }
 
-static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const FloatSize& delta, ScrollableArea& view)
-{
-    ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft, granularity, delta.width());
-    ScrollResultOneDimensional scrolledVertical = view.userScroll(ScrollUp, granularity, delta.height());
-    return ScrollResult(scrolledHorizontal.didScroll, scrolledVertical.didScroll, scrolledHorizontal.unusedScrollDelta, scrolledVertical.unusedScrollDelta);
-}
-
 // Returns true if a scroll occurred.
 ScrollResult LocalFrame::applyScrollDelta(ScrollGranularity granularity, const FloatSize& delta, bool isScrollBegin)
 {
@@ -789,7 +782,14 @@ ScrollResult LocalFrame::applyScrollDelta(ScrollGranularity granularity, const F
     if (remainingDelta.isZero())
         return ScrollResult(delta.width(), delta.height(), 0.0f, 0.0f);
 
-    ScrollResult result = scrollAreaOnBothAxes(granularity, remainingDelta, *view()->scrollableArea());
+    // TODO(bokan): The delta coming in here is the GestureEvent delta, which is
+    // positive if the user scrolls up or left. For scrolling, a positive delta
+    // implies downward or rightward scrolling. This negation should happen up
+    // in the call chain.
+    FloatSize normalizedDelta = remainingDelta.scaledBy(-1);
+
+    ScrollResult result = view()->scrollableArea()->userScroll(granularity, normalizedDelta);
+
     result.didScrollX = result.didScrollX || (remainingDelta.width() != delta.width());
     result.didScrollY = result.didScrollY || (remainingDelta.height() != delta.height());