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

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

 // 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.
 
 #include "core/frame/RootFrameViewport.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/ScrollAlignment.h"
 #include "core/layout/ScrollAnchor.h"
 #include "platform/geometry/DoubleRect.h"
@@ skipping 77 matching lines @@
   delta = targetOffset - scrollOffset();
   visualViewport().setScrollOffset(visualViewport().scrollOffset() + delta,
                                    ProgrammaticScroll);
 }
 
 void RootFrameViewport::didUpdateVisualViewport() {
   if (RuntimeEnabledFeatures::scrollAnchoringEnabled()) {
     if (ScrollAnchor* anchor = layoutViewport().scrollAnchor())
       anchor->clear();
   }
-
-  layoutViewport().updateScrollbars();
 }
 
 LayoutBox* RootFrameViewport::layoutBox() const {
   return layoutViewport().layoutBox();
 }
 
 FloatQuad RootFrameViewport::localToVisibleContentQuad(
     const FloatQuad& quad,
     const LayoutObject* localObject,
     unsigned flags) const {
@@ skipping 87 matching lines @@
   }
 
   ScrollOffset clampedOffset = clampScrollOffset(offset);
   ScrollableArea::setScrollOffset(clampedOffset, scrollType, scrollBehavior);
 }
 
 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,
                                              ScrollType scrollType) {
   // We want to move the rect into the viewport that excludes the scrollbars so
   // we intersect the visual viewport with the scrollbar-excluded frameView
   // content rect. However, we don't use visibleContentRect directly since it
   // floors the scroll offset. Instead, we use ScrollAnimatorBase::currentOffset
   // and construct a LayoutRect from that.
   LayoutRect frameRectInContent =
@@ skipping 238 matching lines @@
   visualViewport().clearScrollableArea();
 }
 
 DEFINE_TRACE(RootFrameViewport) {
   visitor->trace(m_visualViewport);
   visitor->trace(m_layoutViewport);
   ScrollableArea::trace(visitor);
 }
 
 }  // namespace blink