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

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

Issue 1708393002: Removed m_previousWheelScrolledNode from EventHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 10 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 | « third_party/WebKit/Source/core/input/EventHandler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/input/EventHandler.cpp
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
index 79223c9c4ca417c9f27fca8e78c7ab01ab1f8aab..6b5ec35a4eeb7451eeba26a2ae9023d32c18b2cf 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -286,7 +286,6 @@ DEFINE_TRACE(EventHandler)
visitor->trace(m_clickNode);
visitor->trace(m_dragTarget);
visitor->trace(m_frameSetBeingResized);
- visitor->trace(m_previousWheelScrolledNode);
visitor->trace(m_scrollbarHandlingScrollGesture);
visitor->trace(m_targetForTouchID);
visitor->trace(m_touchSequenceDocument);
@@ -327,7 +326,6 @@ void EventHandler::clear()
m_mousePressed = false;
m_capturesDragging = false;
m_capturingMouseEventsNode = nullptr;
- m_previousWheelScrolledNode = nullptr;
m_targetForTouchID.clear();
m_touchSequenceDocument.clear();
m_touchSequenceUserGestureToken.clear();
@@ -1792,9 +1790,6 @@ WebInputEventResult EventHandler::handleWheelEvent(const PlatformWheelEvent& eve
if (node && node->isTextNode())
node = FlatTreeTraversal::parent(*node);
- if (m_previousWheelScrolledNode)
- m_previousWheelScrolledNode = nullptr;
-
bool isOverWidget = result.isOverWidget();
if (node) {
@@ -1849,22 +1844,20 @@ void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEv
if (!wheelEvent->canScroll())
return;
- Node* stopNode = m_previousWheelScrolledNode.get();
ScrollGranularity granularity = wheelGranularityToScrollGranularity(wheelEvent);
+ Node* node = nullptr;
// Break up into two scrolls if we need to. Diagonal movement on
// a MacBook pro is an example of a 2-dimensional mouse wheel event (where both deltaX and deltaY can be set).
// FIXME: enable scroll customization in this case. See crbug.com/410974.
if (wheelEvent->getRailsMode() != Event::RailsModeVertical
- && scroll(ScrollRightIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaX()).didScroll)
+ && scroll(ScrollRightIgnoringWritingMode, granularity, startNode, &node, wheelEvent->deltaX()).didScroll)
wheelEvent->setDefaultHandled();
if (wheelEvent->getRailsMode() != Event::RailsModeHorizontal
- && scroll(ScrollDownIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaY()).didScroll)
+ && scroll(ScrollDownIgnoringWritingMode, granularity, startNode, &node, wheelEvent->deltaY()).didScroll)
wheelEvent->setDefaultHandled();
-
- m_previousWheelScrolledNode = stopNode;
}
WebInputEventResult EventHandler::handleGestureShowPress()
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698