MainFrame scrollbars should work with RFV instead of FV

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

Index: third_party/WebKit/Source/core/frame/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index 64b7372f33952e86bdeab428f10cd522dea8979c..5ee666bb81b2c54e8df6a7645dd63c2010116597 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -400,10 +400,7 @@ class CORE_EXPORT FrameView final
   // Sets the tickmarks for the FrameView, overriding the default behavior
   // which is to display the tickmarks corresponding to find results.
   // If |m_tickmarks| is empty, the default behavior is restored.
-  void setTickmarks(const Vector<IntRect>& tickmarks) {
-    m_tickmarks = tickmarks;
-    invalidatePaintForTickmarks();
-  }
+  void setTickmarks(const Vector<IntRect>&);
 
   void invalidatePaintForTickmarks();
 
@@ -462,6 +459,9 @@ class CORE_EXPORT FrameView final
     return m_scrollbarManager.verticalScrollbar();
   }
   LayoutScrollbarPart* scrollCorner() const override { return m_scrollCorner; }
+  // Called to update the scrollbars to accurately reflect the state of the
+  // view.
+  void updateScrollbars();
 
   void positionScrollbarLayers();
 
@@ -755,11 +755,7 @@ class CORE_EXPORT FrameView final
       bool& newHasVerticalScrollbar,
       const IntSize& docSize,
       ComputeScrollbarExistenceOption = FirstPass) const;
-  void updateScrollbarGeometry();
 
-  // Called to update the scrollbars to accurately reflect the state of the
-  // view.
-  void updateScrollbars();
   void updateScrollbarsIfNeeded();
 
   class InUpdateScrollbarsScope {
@@ -792,6 +788,14 @@ class CORE_EXPORT FrameView final
     // setHas*Scrollbar functions above.
     Scrollbar* createScrollbar(ScrollbarOrientation) override;
 
+    // TODO(ymalik): There is probably scope for refactoring common code
+    // between this and PaintLayerScrollableArea.
+    bool needScrollbar(ScrollbarOrientation,
+                       const IntSize& docSize,
+                       ComputeScrollbarExistenceOption) const;
+    // Updates the scrollbar geometry given the size of the frame view rect.
+    void updateScrollbarGeometry(IntSize viewSize);
+
    protected:
     void destroyScrollbar(ScrollbarOrientation) override;
   };
@@ -869,10 +873,6 @@ class CORE_EXPORT FrameView final
   static bool computeCompositedSelection(LocalFrame&, CompositedSelection&);
   void updateCompositedSelectionIfNeeded();
 
-  // Returns true if the FrameView's own scrollbars overlay its content when
-  // visible.
-  bool hasOverlayScrollbars() const;
-
   // Returns true if the frame should use custom scrollbars. If true, one of
   // either |customScrollbarElement| or |customScrollbarFrame| will be set to
   // the element or frame which owns the scrollbar with the other set to null.