Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(880)

Unified Diff: Source/core/input/EventHandler.cpp

Issue 1253053005: Dont reset unusedScrollDelta for nonScrollable Axes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed relavant tests Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/input/EventHandler.cpp
diff --git a/Source/core/input/EventHandler.cpp b/Source/core/input/EventHandler.cpp
index ffd29b32d5148f8bb2befaeaf09a9fdb6f0e29e3..35f10884920233c189571b0f19c341c60ffaaed3 100644
--- a/Source/core/input/EventHandler.cpp
+++ b/Source/core/input/EventHandler.cpp
@@ -2343,13 +2343,6 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
ScrollResult scrollResult = m_frame->applyScrollDelta(delta, false);
FloatPoint position = FloatPoint(gestureEvent.position().x(), gestureEvent.position().y());
FloatSize velocity = FloatSize(gestureEvent.velocityX(), gestureEvent.velocityY());
- if (m_frame->isMainFrame() && m_frame->view() && m_frame->view()->scrollableArea()) {
- ScrollableArea* scrollablearea = m_frame->view()->scrollableArea();
- // TODO(sataya.m) : In Case of android set unusedDelta to 0 to ensure overflow is not reported
- // on non-scrollable axis. Move this check to CC to block OverscrollGlow Animation on non-scrollable axes.
- scrollResult.unusedScrollDeltaX = scrollablearea->scrollSize(HorizontalScrollbar) ? scrollResult.unusedScrollDeltaX : 0;
- scrollResult.unusedScrollDeltaY = scrollablearea->scrollSize(VerticalScrollbar) ? scrollResult.unusedScrollDeltaY : 0;
- }
handleOverscroll(scrollResult, position, velocity);
if (scrollResult.didScroll()) {
setFrameWasScrolledByUser();
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698