Merged FrameView and LayoutBox scrolling in EventHandler.

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 763 matching lines @@
 {
     if (isScrollBegin)
         host()->topControls().scrollBegin();
 
     if (!view() || delta.isZero())
         return ScrollResult(false, false, delta.width(), delta.height());
 
     FloatSize remainingDelta = delta;
 
     // If this is main frame, allow top controls to scroll first.
-    if (shouldScrollTopControls(delta))
+    if (shouldScrollTopControls(granularity, delta))
         remainingDelta = host()->topControls().scrollBy(remainingDelta);
 
     if (remainingDelta.isZero())
         return ScrollResult(delta.width(), delta.height(), 0.0f, 0.0f);
 
     ScrollResult result = view()->scrollableArea()->userScroll(granularity, remainingDelta);
     result.didScrollX = result.didScrollX || (remainingDelta.width() != delta.width());
     result.didScrollY = result.didScrollY || (remainingDelta.height() != delta.height());
 
     return result;
 }
 
-bool LocalFrame::shouldScrollTopControls(const FloatSize& delta) const
+bool LocalFrame::shouldScrollTopControls(ScrollGranularity granularity, const FloatSize& delta) const
 {
     if (!isMainFrame())
         return false;
 
+    if (granularity != ScrollByPixel && granularity != ScrollByPrecisePixel)
+        return false;
+
     // Always give the delta to the top controls if the scroll is in
     // the direction to show the top controls. If it's in the
     // direction to hide the top controls, only give the delta to the
     // top controls when the frame can scroll.
     DoublePoint maximumScrollPosition =
         host()->visualViewport().maximumScrollPositionDouble() +
         toDoubleSize(view()->maximumScrollPositionDouble());
     DoublePoint scrollPosition = host()->visualViewport()
         .visibleRectInDocument().location();
     return delta.height() < 0 || scrollPosition.y() < maximumScrollPosition.y();
@@ skipping 63 matching lines @@
 {
     m_frame->disableNavigation();
 }
 
 FrameNavigationDisabler::~FrameNavigationDisabler()
 {
     m_frame->enableNavigation();
 }
 
 } // namespace blink