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

Unified Diff: sky/engine/core/page/EventHandler.cpp

Issue 684063002: Remove more frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « sky/engine/core/page/EventHandler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/page/EventHandler.cpp
diff --git a/sky/engine/core/page/EventHandler.cpp b/sky/engine/core/page/EventHandler.cpp
index 16842801ab218be01f194ae1e3c0acf287d69dac..615a54ec5532086e2d80a062a09e1abb4366cea8 100644
--- a/sky/engine/core/page/EventHandler.cpp
+++ b/sky/engine/core/page/EventHandler.cpp
@@ -784,7 +784,6 @@ bool EventHandler::scroll(ScrollDirection direction, ScrollGranularity granulari
*stopNode = curBox->node();
if (didScroll || shouldStopBubbling) {
- setFrameWasScrolledByUser();
return true;
}
@@ -1483,7 +1482,6 @@ bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
{
#define RETURN_WHEEL_EVENT_HANDLED() \
esprehn 2014/10/29 03:06:48 you should remove the macro, all it did was call t
{ \
- setFrameWasScrolledByUser(); \
return true; \
}
@@ -1936,7 +1934,6 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
m_previousGestureScrolledNode = stopNode;
if (horizontalScroll || verticalScroll) {
- setFrameWasScrolledByUser();
return true;
}
@@ -1961,9 +1958,6 @@ bool EventHandler::sendScrollEventToView(const PlatformGestureEvent& gestureEven
syntheticWheelEvent.setHasPreciseScrollingDeltas(true);
bool scrolledFrame = view->wheelEvent(syntheticWheelEvent);
- if (scrolledFrame)
- setFrameWasScrolledByUser();
-
return scrolledFrame;
}
@@ -2450,12 +2444,6 @@ void EventHandler::capsLockStateMayHaveChanged()
{
}
-void EventHandler::setFrameWasScrolledByUser()
-{
- if (FrameView* view = m_frame->view())
- view->setWasScrolledByUser(true);
-}
-
bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev)
{
// FIXME(sky): Remove
« no previous file with comments | « sky/engine/core/page/EventHandler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698