Remove more frame-level scrolling machinery.

sky/engine/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 766 matching lines @@
     RenderBox* curBox = node->renderer()->enclosingBox();
     while (curBox && !curBox->isRenderView()) {
         // 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(direction, granularity, delta);
 
         if (didScroll && stopNode)
             *stopNode = curBox->node();
 
         if (didScroll || shouldStopBubbling) {
-            setFrameWasScrolledByUser();
             return true;
         }
 
         curBox = curBox->containingBlock();
     }
 
     return false;
 }
 
 bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
@@ skipping 676 matching lines @@
         HitTestResult result(windowPoint);
         renderView->hitTest(request, result);
         return result.scrollbar();
     }
 
     return false;
 }
 
 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 this and return. now you can
just write the return.

     { \
-        setFrameWasScrolledByUser(); \
         return true; \
     }
 
     Document* doc = m_frame->document();
 
     if (!doc->renderView())
         return false;
 
     RefPtr<FrameView> protector(m_frame->view());
 
@@ skipping 432 matching lines @@
 
     // First try to scroll the closest scrollable RenderBox ancestor of |node|.
     ScrollGranularity granularity = ScrollByPixel;
     bool horizontalScroll = scroll(ScrollLeft, granularity, node, &stopNode, delta.width());
     bool verticalScroll = scroll(ScrollUp, granularity, node, &stopNode, delta.height());
 
     if (scrollShouldNotPropagate)
         m_previousGestureScrolledNode = stopNode;
 
     if (horizontalScroll || verticalScroll) {
-        setFrameWasScrolledByUser();
         return true;
     }
 
     // Otherwise try to scroll the view.
     return sendScrollEventToView(gestureEvent, delta);
 }
 
 bool EventHandler::sendScrollEventToView(const PlatformGestureEvent& gestureEvent, const FloatSize& scaledDelta)
 {
     FrameView* view = m_frame->view();
     if (!view)
         return false;
 
     const float tickDivisor = static_cast<float>(WheelEvent::TickMultiplier);
     IntPoint point(gestureEvent.position().x(), gestureEvent.position().y());
     IntPoint globalPoint(gestureEvent.globalPosition().x(), gestureEvent.globalPosition().y());
     PlatformWheelEvent syntheticWheelEvent(point, globalPoint,
         scaledDelta.width(), scaledDelta.height(),
         scaledDelta.width() / tickDivisor, scaledDelta.height() / tickDivisor,
         ScrollByPixelWheelEvent,
         gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey());
     syntheticWheelEvent.setHasPreciseScrollingDeltas(true);
 
     bool scrolledFrame = view->wheelEvent(syntheticWheelEvent);
-    if (scrolledFrame)
-        setFrameWasScrolledByUser();
-
     return scrolledFrame;
 }
 
 void EventHandler::clearGestureScrollNodes()
 {
     m_scrollGestureHandlingNode = nullptr;
     m_previousGestureScrolledNode = nullptr;
 }
 
 bool EventHandler::isScrollbarHandlingGestures() const
@@ skipping 466 matching lines @@
     FocusType focusType = event->shiftKey() ? FocusTypeBackward : FocusTypeForward;
 
     if (page->focusController().advanceFocus(focusType))
         event->setDefaultHandled();
 }
 
 void EventHandler::capsLockStateMayHaveChanged()
 {
 }
 
-void EventHandler::setFrameWasScrolledByUser()
-{
-    if (FrameView* view = m_frame->view())
-        view->setWasScrolledByUser(true);
-}
-
 bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev)
 {
     // FIXME(sky): Remove
     return false;
 }
 
 // If scrollbar (under mouse) is different from last, send a mouse exited. Set
 // last to scrollbar if setLast is true; else set last to 0.
 void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setLast)
 {
@@ skipping 363 matching lines @@
 unsigned EventHandler::accessKeyModifiers()
 {
 #if OS(MACOSX)
     return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
 #else
     return PlatformEvent::AltKey;
 #endif
 }
 
 } // namespace blink