Revert "MainFrame scrollbars should work with RFV instead of FV"

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef RootFrameViewport_h
 #define RootFrameViewport_h
 
 #include "core/CoreExport.h"
 #include "platform/scroll/ScrollableArea.h"
 
@@ skipping 46 matching lines @@
   void setScrollOffset(const ScrollOffset&,
                        ScrollType,
                        ScrollBehavior = ScrollBehaviorInstant) override;
   LayoutRect scrollIntoView(const LayoutRect& rectInContent,
                             const ScrollAlignment& alignX,
                             const ScrollAlignment& alignY,
                             ScrollType = ProgrammaticScroll) override;
   IntRect visibleContentRect(
       IncludeScrollbarsInRect = ExcludeScrollbars) const override;
   bool shouldUseIntegerScrollOffset() const override;
+  LayoutRect visualRectForScrollbarParts() const override {
+    ASSERT_NOT_REACHED();
+    return LayoutRect();
+  }
+  bool isActive() const override;
   int scrollSize(ScrollbarOrientation) const override;
   bool isScrollCornerVisible() const override;
   IntRect scrollCornerRect() const override;
   void updateScrollOffset(const ScrollOffset&, ScrollType) override;
   IntSize scrollOffsetInt() const override;
   ScrollOffset scrollOffset() const override;
   IntSize minimumScrollOffsetInt() const override;
   IntSize maximumScrollOffsetInt() const override;
   ScrollOffset maximumScrollOffset() const override;
   IntSize contentsSize() const override;
@@ skipping 18 matching lines @@
   void updateCompositorScrollAnimations() override;
   void cancelProgrammaticScrollAnimation() override;
   ScrollBehavior scrollBehaviorStyle() const override;
   Widget* getWidget() override;
   void clearScrollableArea() override;
   LayoutBox* layoutBox() const override;
   FloatQuad localToVisibleContentQuad(const FloatQuad&,
                                       const LayoutObject*,
                                       unsigned = 0) const final;
 
-  // Scrollbar related
-  // TODO(crbug.com/661236): Seperate the scrollbar related logic from
-  // ScrollableArea.
-  Scrollbar* horizontalScrollbar() const override;
-  Scrollbar* verticalScrollbar() const override;
-  bool isActive() const override;
-  bool hasOverlayScrollbars() const override;
-  void setScrollbarNeedsPaintInvalidation(ScrollbarOrientation) override;
-  LayoutRect visualRectForScrollbarParts() const override;
-  ScrollbarOverlayColorTheme getScrollbarOverlayColorTheme() const override;
-  void getTickmarks(Vector<IntRect>& rects) const override;
-  void mouseEnteredScrollbar(Scrollbar&) override;
-  void mouseExitedScrollbar(Scrollbar&) override;
-  void scrollbarVisibilityChanged() override;
-  bool scrollbarsHidden() const override;
-  IntRect convertFromScrollbarToContainingWidget(const Scrollbar&,
-                                                 const IntRect&) const override;
-  IntRect convertFromContainingWidgetToScrollbar(const Scrollbar&,
-                                                 const IntRect&) const override;
-  IntPoint convertFromScrollbarToContainingWidget(
-      const Scrollbar&,
-      const IntPoint&) const override;
-  IntPoint convertFromContainingWidgetToScrollbar(
-      const Scrollbar&,
-      const IntPoint&) const override;
-  ScrollOffset scrollAnimatorDesiredTargetOffset() const override;
-  void setScrollCornerNeedsPaintInvalidation() override;
-
  private:
   RootFrameViewport(ScrollableArea& visualViewport,
                     ScrollableArea& layoutViewport);
 
   enum ViewportToScrollFirst { VisualViewport, LayoutViewport };
 
   ScrollOffset scrollOffsetFromScrollAnimators() const;
 
   void distributeScrollBetweenViewports(const ScrollOffset&,
                                         ScrollType,
@@ skipping 16 matching lines @@
 
 DEFINE_TYPE_CASTS(RootFrameViewport,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->isRootFrameViewport(),
                   scrollableArea.isRootFrameViewport());
 
 }  // namespace blink
 
 #endif  // RootFrameViewport_h