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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1056983004: OverscrollGlow for mainThread-{BLINK CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: addressed review comments Created 5 years, 7 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
« Source/core/frame/RootFrameViewport.cpp ('K') | « Source/core/page/EventHandler.h ('k') | Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 1cd7458bbc67b8dab90407b9c3189657103bf4e1..744400b2d72985b2859269f938e1d2874ce934ea 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -233,6 +233,8 @@ EventHandler::EventHandler(LocalFrame* frame)
, m_eventHandlerWillResetCapturingMouseEventsNode(0)
, m_clickCount(0)
, m_shouldOnlyFireDragOverEvent(false)
+ , m_unusedDelta(FloatSize())
+ , m_accumulatedRootOverscroll(FloatSize())
, m_mousePositionIsUnknown(true)
, m_mouseDownTimestamp(0)
, m_widgetIsLatched(false)
@@ -924,10 +926,10 @@ void EventHandler::stopAutoscroll()
controller->stopAutoscroll();
}
-bool EventHandler::scroll(ScrollDirection direction, ScrollGranularity granularity, Node* startNode, Node** stopNode, float delta, IntPoint absolutePoint)
+ScrollResultOneDimensional EventHandler::scroll(ScrollDirection direction, ScrollGranularity granularity, Node* startNode, Node** stopNode, float delta, IntPoint absolutePoint)
{
if (!delta)
- return false;
+ return ScrollResultOneDimensional(false);
Node* node = startNode;
@@ -938,7 +940,7 @@ bool EventHandler::scroll(ScrollDirection direction, ScrollGranularity granulari
node = m_mousePressNode.get();
if (!node || !node->layoutObject())
- return false;
+ return ScrollResultOneDimensional(false, delta);
LayoutBox* curBox = node->layoutObject()->enclosingBox();
while (curBox && !curBox->isLayoutView()) {
@@ -947,20 +949,21 @@ bool EventHandler::scroll(ScrollDirection direction, ScrollGranularity granulari
// If we're at the stopNode, we should try to scroll it but we shouldn't bubble past it
bool shouldStopBubbling = stopNode && *stopNode && curBox->node() == *stopNode;
- bool didScroll = curBox->scroll(physicalDirection, granularity, delta);
+ ScrollResultOneDimensional result = curBox->scroll(physicalDirection, granularity, delta);
- if (didScroll && stopNode)
+ if (result.didScroll && stopNode)
*stopNode = curBox->node();
- if (didScroll || shouldStopBubbling) {
+ if (result.didScroll || shouldStopBubbling) {
setFrameWasScrolledByUser();
- return true;
+ result.didScroll = true;
+ return result;
}
curBox = curBox->containingBlock();
}
- return false;
+ return ScrollResultOneDimensional(false, delta);
}
void EventHandler::customizedScroll(const Node& startNode, ScrollState& scrollState)
@@ -980,14 +983,14 @@ bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity g
// here because of an onLoad event, in which case the final layout hasn't been performed yet.
m_frame->document()->updateLayoutIgnorePendingStylesheets();
// FIXME: enable scroll customization in this case. See crbug.com/410974.
- if (scroll(direction, granularity, startingNode))
+ if (scroll(direction, granularity, startingNode).didScroll)
return true;
LocalFrame* frame = m_frame;
FrameView* view = frame->view();
if (view) {
ScrollDirectionPhysical physicalDirection =
toPhysicalDirection(direction, view->isVerticalDocument(), view->isFlippedDocument());
- if (view->scrollableArea()->scroll(physicalDirection, granularity)) {
+ if (view->scrollableArea()->scroll(physicalDirection, granularity).didScroll) {
setFrameWasScrolledByUser();
return true;
}
@@ -2179,7 +2182,7 @@ bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
if (!view)
return false;
- if (view->scrollableArea()->handleWheel(event).didScroll)
+ if (view->scrollableArea()->handleWheel(event).didScroll())
RETURN_WHEEL_EVENT_HANDLED();
return false;
@@ -2204,11 +2207,11 @@ void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEv
// FIXME: enable scroll customization in this case. See crbug.com/410974.
if (wheelEvent->railsMode() != Event::RailsModeVertical
- && scroll(ScrollRightIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaX(), absolutePosition))
+ && scroll(ScrollRightIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaX(), absolutePosition).didScroll)
wheelEvent->setDefaultHandled();
if (wheelEvent->railsMode() != Event::RailsModeHorizontal
- && scroll(ScrollDownIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaY(), absolutePosition))
+ && scroll(ScrollDownIgnoringWritingMode, granularity, startNode, &stopNode, wheelEvent->deltaY(), absolutePosition).didScroll)
wheelEvent->setDefaultHandled();
if (!m_latchedWheelEventNode)
@@ -2650,6 +2653,18 @@ bool EventHandler::handleGestureScrollBegin(const PlatformGestureEvent& gestureE
return true;
}
+void EventHandler::resetOverscroll(bool didScrollX, bool didScrollY)
+{
+if (didScrollX) {
majidvp 2015/06/02 17:00:31 nitp: fix indentation
MuVen 2015/06/03 09:32:18 Done.
+ m_accumulatedRootOverscroll.setWidth(0);
+ m_unusedDelta.setWidth(0);
+}
+if (didScrollY) {
+ m_accumulatedRootOverscroll.setHeight(0);
+ m_unusedDelta.setHeight(0);
+}
+}
+
bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gestureEvent)
{
ASSERT(gestureEvent.type() == PlatformEvent::GestureScrollUpdate);
@@ -2709,14 +2724,19 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
// First try to scroll the closest scrollable LayoutBox ancestor of |node|.
ScrollGranularity granularity = ScrollByPrecisePixel;
- bool horizontalScroll = scroll(ScrollLeftIgnoringWritingMode, granularity, node, &stopNode, delta.width());
+ m_unusedDelta = FloatSize();
+ ScrollResultOneDimensional result = scroll(ScrollLeftIgnoringWritingMode, granularity, node, &stopNode, delta.width());
+ bool horizontalScroll = result.didScroll;
if (!gestureEvent.preventPropagation())
stopNode = nullptr;
- bool verticalScroll = scroll(ScrollUpIgnoringWritingMode, granularity, node, &stopNode, delta.height());
+ result = scroll(ScrollUpIgnoringWritingMode, granularity, node, &stopNode, delta.height());
+ bool verticalScroll = result.didScroll;
scrolled = horizontalScroll || verticalScroll;
if (gestureEvent.preventPropagation())
m_previousGestureScrolledNode = stopNode;
+
+ resetOverscroll(horizontalScroll, verticalScroll);
}
if (scrolled) {
setFrameWasScrolledByUser();
@@ -2728,7 +2748,18 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
return false;
// Try to scroll the frame view.
- if (m_frame->applyScrollDelta(delta, false)) {
+ ScrollResult resultScrollDelta = m_frame->applyScrollDelta(delta, false);
+ m_unusedDelta.setWidth(resultScrollDelta.unusedScrollDeltaX);
+ m_unusedDelta.setHeight(resultScrollDelta.unusedScrollDeltaY);
+ resetOverscroll(resultScrollDelta.didScrollX, resultScrollDelta.didScrollY);
+ if (m_frame->isMainFrame() && m_unusedDelta != FloatSize()) {
+ m_accumulatedRootOverscroll += m_unusedDelta;
+ FloatPoint position = FloatPoint(gestureEvent.position().x(), gestureEvent.position().y());
+ FloatSize velocity = FloatSize(gestureEvent.velocityX(), gestureEvent.velocityY());
+ m_frame->chromeClient().didOverscroll(m_unusedDelta, m_accumulatedRootOverscroll, position, velocity);
+ }
+
+ if (resultScrollDelta.didScroll()) {
setFrameWasScrolledByUser();
return true;
}
@@ -2742,6 +2773,8 @@ void EventHandler::clearGestureScrollNodes()
m_previousGestureScrolledNode = nullptr;
m_deltaConsumedForScrollSequence = false;
m_currentScrollChain.clear();
+ m_accumulatedRootOverscroll = FloatSize();
+ m_unusedDelta = FloatSize();
}
bool EventHandler::isScrollbarHandlingGestures() const
@@ -3644,7 +3677,7 @@ void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
ScrollDirection direction = event->shiftKey() ? ScrollBlockDirectionBackward : ScrollBlockDirectionForward;
// FIXME: enable scroll customization in this case. See crbug.com/410974.
- if (scroll(direction, ScrollByPage)) {
+ if (scroll(direction, ScrollByPage).didScroll) {
event->setDefaultHandled();
return;
}
@@ -3656,7 +3689,7 @@ void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
ScrollDirectionPhysical physicalDirection =
toPhysicalDirection(direction, view->isVerticalDocument(), view->isFlippedDocument());
- if (view->scrollableArea()->scroll(physicalDirection, ScrollByPage))
+ if (view->scrollableArea()->scroll(physicalDirection, ScrollByPage).didScroll)
event->setDefaultHandled();
}
« Source/core/frame/RootFrameViewport.cpp ('K') | « Source/core/page/EventHandler.h ('k') | Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698