OverscrollGlow for mainThread-{BLINK CHANGES}

Source/core/page/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 215 matching lines @@
     , m_selectionInitiationState(HaveNotStartedSelection)
     , m_hoverTimer(this, &EventHandler::hoverTimerFired)
     , m_cursorUpdateTimer(this, &EventHandler::cursorUpdateTimerFired)
     , m_mouseDownMayStartAutoscroll(false)
     , m_fakeMouseMoveEventTimer(this, &EventHandler::fakeMouseMoveEventTimerFired)
     , m_svgPan(false)
     , m_resizeScrollableArea(nullptr)
     , m_eventHandlerWillResetCapturingMouseEventsNode(0)
     , m_clickCount(0)
     , m_shouldOnlyFireDragOverEvent(false)
+    , m_unusedDelta(FloatSize())
+    , m_accumulatedRootOverscroll(FloatSize())
     , m_mousePositionIsUnknown(true)
     , m_mouseDownTimestamp(0)
     , m_widgetIsLatched(false)
     , m_touchPressed(false)
     , m_scrollGestureHandlingNode(nullptr)
     , m_lastGestureScrollOverWidget(false)
     , m_maxMouseMovedDuration(0)
     , m_longTapShouldInvokeContextMenu(false)
     , m_activeIntervalTimer(this, &EventHandler::activeIntervalTimerFired)
     , m_lastShowPressTimestamp(0)
@@ skipping 671 matching lines @@
 
     return result;
 }
 
 void EventHandler::stopAutoscroll()
 {
     if (AutoscrollController* controller = autoscrollController())
         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;
 
     if (!node)
         node = m_frame->document()->focusedElement();
 
     if (!node)
         node = m_mousePressNode.get();
 
     if (!node || !node->layoutObject())
-        return false;
+        return ScrollResultOneDimensional(false);

[majidvp, 2015/05/14 21:08:39]

Shouldn't this return the delta?

[MuVen, 2015/05/26 09:58:35]

Done.

 
     LayoutBox* curBox = node->layoutObject()->enclosingBox();
+    ScrollResultOneDimensional result(false);
     while (curBox && !curBox->isLayoutView()) {
         ScrollDirection physicalDirection = toPhysicalDirection(
             direction, curBox->isHorizontalWritingMode(), curBox->style()->isFlippedBlocksWritingMode());
 
         // 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);
+        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;
+            if (!result.didScroll)

[majidvp, 2015/05/14 21:08:39]

The if statement is redundant.

[MuVen, 2015/05/26 09:58:35]

Done.

+                result.didScroll = true;
+            return result;
         }
 
         curBox = curBox->containingBlock();
     }
 
-    return false;
+    return result;

[majidvp, 2015/05/14 21:08:39]

Again, I feel this should return {false, delta} instead of result which is
{false, 0}.

I think moving result declaration inside the loop and returning
|ScrollResult(false, delta)| here makes the logic more clear.

[MuVen, 2015/05/26 09:58:35]

Done.

 }
 
 void EventHandler::customizedScroll(const Node& startNode, ScrollState& scrollState)
 {
     if (scrollState.fullyConsumed())
         return;
 
     if (m_currentScrollChain.isEmpty())
         recomputeScrollChain(*m_frame, startNode, m_currentScrollChain);
     scrollState.setScrollChain(m_currentScrollChain);
     scrollState.distributeToScrollChainDescendant();
 }
 
 bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
 {
     // The layout needs to be up to date to determine if we can scroll. We may be
     // 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 && view->scroll(direction, granularity)) {
+    if (view && view->scroll(direction, granularity).didScroll) {
         setFrameWasScrolledByUser();
         return true;
     }
     Frame* parentFrame = frame->tree().parent();
     if (!parentFrame || !parentFrame->isLocalFrame())
         return false;
     // FIXME: Broken for OOPI.
     return toLocalFrame(parentFrame)->eventHandler().bubblingScroll(direction, granularity, m_frame->deprecatedLocalOwner());
 }
 
@@ skipping 1195 matching lines @@
 
     Node* stopNode = m_previousWheelScrolledNode.get();
     ScrollGranularity granularity = wheelGranularityToScrollGranularity(wheelEvent);
     IntPoint absolutePosition = roundedIntPoint(wheelEvent->absoluteLocation());
 
     // 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->railsMode() != Event::RailsModeVertical
-        && scroll(ScrollRight, granularity, startNode, &stopNode, wheelEvent->deltaX(), absolutePosition))
+        && scroll(ScrollRight, granularity, startNode, &stopNode, wheelEvent->deltaX(), absolutePosition).didScroll)
         wheelEvent->setDefaultHandled();
 
     if (wheelEvent->railsMode() != Event::RailsModeHorizontal
-        && scroll(ScrollDown, granularity, startNode, &stopNode, wheelEvent->deltaY(), absolutePosition))
+        && scroll(ScrollDown, granularity, startNode, &stopNode, wheelEvent->deltaY(), absolutePosition).didScroll)
         wheelEvent->setDefaultHandled();
 
     if (!m_latchedWheelEventNode)
         m_previousWheelScrolledNode = stopNode;
 }
 
 bool EventHandler::handleGestureShowPress()
 {
     m_lastShowPressTimestamp = WTF::currentTime();
 
@@ skipping 480 matching lines @@
             m_previousGestureScrolledNode = scrollState->currentNativeScrollingElement();
             m_deltaConsumedForScrollSequence = scrollState->deltaConsumedForScrollSequence();
             scrolled = scrollState->deltaX() != gestureEvent.deltaX()
                 || scrollState->deltaY() != gestureEvent.deltaY();
         } else {
             if (gestureEvent.preventPropagation())
                 stopNode = m_previousGestureScrolledNode.get();
 
             // First try to scroll the closest scrollable LayoutBox ancestor of |node|.
             ScrollGranularity granularity = ScrollByPrecisePixel;
-            bool horizontalScroll = scroll(ScrollLeft, granularity, node, &stopNode, delta.width());
+            m_unusedDelta = FloatSize();
+            ScrollResultOneDimensional result = scroll(ScrollLeft, granularity, node, &stopNode, delta.width());
+            bool horizontalScroll = result.didScroll;
             if (!gestureEvent.preventPropagation())
                 stopNode = nullptr;
-            bool verticalScroll = scroll(ScrollUp, granularity, node, &stopNode, delta.height());
+            result = scroll(ScrollUp, granularity, node, &stopNode, delta.height());
+            bool verticalScroll = result.didScroll;
             scrolled = horizontalScroll || verticalScroll;
 
             if (gestureEvent.preventPropagation())
                 m_previousGestureScrolledNode = stopNode;
+
+            if (horizontalScroll) {
+                m_accumulatedRootOverscroll.setWidth(0);
+                m_unusedDelta.setWidth(0);
+            }
+
+            if (verticalScroll) {
+                m_accumulatedRootOverscroll.setHeight(0);
+                m_unusedDelta.setHeight(0);
+            }
         }
         if (scrolled) {
             setFrameWasScrolledByUser();
             return true;
         }
     }
 
     if (RuntimeEnabledFeatures::scrollCustomizationEnabled())
         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);

[MuVen, 2015/05/14 12:34:21]

modified the previous logic,  
m_unusedDelta.setWidth(-resultScrollDelta.unusedScrollDeltaX);

As i missed to modify the code at applyScrollDelta API. The logic
is captured in the tests.

+    m_unusedDelta.setHeight(resultScrollDelta.unusedScrollDeltaY);
+    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;
     }
 
     return false;
 }
 
 void EventHandler::clearGestureScrollNodes()
 {
     m_scrollGestureHandlingNode = nullptr;
     m_previousGestureScrolledNode = nullptr;
     m_deltaConsumedForScrollSequence = false;
     m_currentScrollChain.clear();
+    m_accumulatedRootOverscroll = FloatSize();
+    m_unusedDelta = FloatSize();
 }
 
 bool EventHandler::isScrollbarHandlingGestures() const
 {
     return m_scrollbarHandlingScrollGesture.get();
 }
 
 bool EventHandler::shouldApplyTouchAdjustment(const PlatformGestureEvent& event) const
 {
     if (m_frame->settings() && !m_frame->settings()->touchAdjustmentEnabled())
@@ skipping 881 matching lines @@
 
 void EventHandler::defaultSpaceEventHandler(KeyboardEvent* event)
 {
     ASSERT(event->type() == EventTypeNames::keypress);
 
     if (event->ctrlKey() || event->metaKey() || event->altKey())
         return;
 
     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;
     }
 
     FrameView* view = m_frame->view();
     if (!view)
         return;
 
-    if (view->scroll(direction, ScrollByPage))
+    if (view->scroll(direction, ScrollByPage).didScroll)
         event->setDefaultHandled();
 }
 
 void EventHandler::defaultBackspaceEventHandler(KeyboardEvent* event)
 {
     ASSERT(event->type() == EventTypeNames::keydown);
 
     if (event->ctrlKey() || event->metaKey() || event->altKey())
         return;
 
@@ skipping 502 matching lines @@
 unsigned EventHandler::accessKeyModifiers()
 {
 #if OS(MACOSX)
     return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
 #else
     return PlatformEvent::AltKey;
 #endif
 }
 
 } // namespace blink