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

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

Index: third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
diff --git a/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp b/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
index 4cd6c73b997d5f73cc64f042589deaa3f2273859..611d449105b25e19151eec919936b23baba360eb 100644
--- a/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
+++ b/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
@@ -95,8 +95,6 @@ void RootFrameViewport::didUpdateVisualViewport() {
     if (ScrollAnchor* anchor = layoutViewport().scrollAnchor())
       anchor->clear();
   }
-
-  layoutViewport().updateScrollbars();
 }
 
 LayoutBox* RootFrameViewport::layoutBox() const {
@@ -204,89 +202,6 @@ ScrollBehavior RootFrameViewport::scrollBehaviorStyle() const {
   return layoutViewport().scrollBehaviorStyle();
 }
 
-Scrollbar* RootFrameViewport::horizontalScrollbar() const {
-  return layoutViewport().horizontalScrollbar();
-}
-
-Scrollbar* RootFrameViewport::verticalScrollbar() const {
-  return layoutViewport().verticalScrollbar();
-}
-
-bool RootFrameViewport::hasOverlayScrollbars() const {
-  return layoutViewport().hasOverlayScrollbars();
-}
-
-void RootFrameViewport::setScrollbarNeedsPaintInvalidation(
-    ScrollbarOrientation orientation) {
-  return layoutViewport().setScrollbarNeedsPaintInvalidation(orientation);
-}
-
-LayoutRect RootFrameViewport::visualRectForScrollbarParts() const {
-  return layoutViewport().visualRectForScrollbarParts();
-}
-
-ScrollbarOverlayColorTheme RootFrameViewport::getScrollbarOverlayColorTheme()
-    const {
-  return layoutViewport().getScrollbarOverlayColorTheme();
-}
-
-void RootFrameViewport::getTickmarks(Vector<IntRect>& tickmarks) const {
-  layoutViewport().getTickmarks(tickmarks);
-}
-
-void RootFrameViewport::mouseEnteredScrollbar(Scrollbar& scrollbar) {
-  layoutViewport().mouseEnteredScrollbar(scrollbar);
-}
-
-void RootFrameViewport::mouseExitedScrollbar(Scrollbar& scrollbar) {
-  layoutViewport().mouseExitedScrollbar(scrollbar);
-}
-
-void RootFrameViewport::scrollbarVisibilityChanged() {
-  layoutViewport().scrollbarVisibilityChanged();
-}
-
-bool RootFrameViewport::scrollbarsHidden() const {
-  return layoutViewport().scrollbarsHidden();
-}
-
-IntRect RootFrameViewport::convertFromScrollbarToContainingWidget(
-    const Scrollbar& scrollbar,
-    const IntRect& localRect) const {
-  return layoutViewport().convertFromScrollbarToContainingWidget(scrollbar,
-                                                                 localRect);
-}
-
-IntRect RootFrameViewport::convertFromContainingWidgetToScrollbar(
-    const Scrollbar& scrollbar,
-    const IntRect& parentRect) const {
-  return layoutViewport().convertFromContainingWidgetToScrollbar(scrollbar,
-                                                                 parentRect);
-}
-
-IntPoint RootFrameViewport::convertFromScrollbarToContainingWidget(
-    const Scrollbar& scrollbar,
-    const IntPoint& localPoint) const {
-  return layoutViewport().convertFromScrollbarToContainingWidget(scrollbar,
-                                                                 localPoint);
-}
-
-IntPoint RootFrameViewport::convertFromContainingWidgetToScrollbar(
-    const Scrollbar& scrollbar,
-    const IntPoint& parentPoint) const {
-  return layoutViewport().convertFromContainingWidgetToScrollbar(scrollbar,
-                                                                 parentPoint);
-}
-
-ScrollOffset RootFrameViewport::scrollAnimatorDesiredTargetOffset() const {
-  return layoutViewport().scrollAnimatorDesiredTargetOffset() +
-         visualViewport().scrollAnimatorDesiredTargetOffset();
-}
-
-void RootFrameViewport::setScrollCornerNeedsPaintInvalidation() {
-  return layoutViewport().setScrollCornerNeedsPaintInvalidation();
-}
-
 LayoutRect RootFrameViewport::scrollIntoView(const LayoutRect& rectInContent,
                                              const ScrollAlignment& alignX,
                                              const ScrollAlignment& alignY,