Move viewport actions into an ApplyScroll callback.

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 152 matching lines @@
     String selectedTextForClipboard() const;
 
     PositionWithAffinityTemplate<EditingAlgorithm<NodeTraversal>> positionForPoint(const IntPoint& framePoint);
     Document* documentAtPoint(const IntPoint&);
     EphemeralRangeTemplate<EditingAlgorithm<NodeTraversal>> rangeForPoint(const IntPoint& framePoint);
 
     bool isURLAllowed(const KURL&) const;
     bool shouldReuseDefaultView(const KURL&) const;
     void removeSpellingMarkersUnderWords(const Vector<String>& words);
 
-    // FIXME: once scroll customization is enabled everywhere
-    // (crbug.com/416862), this should take a ScrollState object.
-    ScrollResult applyScrollDelta(ScrollGranularity, const FloatSize& delta, bool isScrollBegin);
-
     // DisplayItemClient methods
     String debugName() const final { return "LocalFrame"; }
     // TODO(chrishtr): fix this.
     LayoutRect visualRect() const override { return LayoutRect(); }
 
     bool shouldThrottleRendering() const;
 
     // Returns the frame scheduler, creating one if needed.
     WebFrameScheduler* frameScheduler();
     void scheduleVisualUpdateUnlessThrottled();
 
     void updateSecurityOrigin(SecurityOrigin*);
 
     bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
 
 private:
     friend class FrameNavigationDisabler;
 
     LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
 
-    bool shouldScrollTopControls(ScrollGranularity, const FloatSize& delta) const;
-
     // Internal Frame helper overrides:
     WindowProxyManager* getWindowProxyManager() const override;
 
     String localLayerTreeAsText(unsigned flags) const;
 
     void enableNavigation() { --m_navigationDisableCount; }
     void disableNavigation() { ++m_navigationDisableCount; }
 
     mutable FrameLoader m_loader;
     Member<NavigationScheduler> m_navigationScheduler;
@@ skipping 105 matching lines @@
     explicit FrameNavigationDisabler(LocalFrame&);
     ~FrameNavigationDisabler();
 
 private:
     Member<LocalFrame> m_frame;
 };
 
 } // namespace blink
 
 #endif // LocalFrame_h