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

third_party/WebKit/Source/platform/scroll/ScrollableArea.h

 /*
  * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 91 matching lines @@
   // Returns a rect, in the space of the area's backing graphics layer, that
   // contains the visual region of all scrollbar parts.
   virtual LayoutRect visualRectForScrollbarParts() const = 0;
 
   static bool scrollBehaviorFromString(const String&, ScrollBehavior&);
 
   void contentAreaWillPaint() const;
   void mouseEnteredContentArea() const;
   void mouseExitedContentArea() const;
   void mouseMovedInContentArea() const;
-  virtual void mouseEnteredScrollbar(Scrollbar&);
-  virtual void mouseExitedScrollbar(Scrollbar&);
+  void mouseEnteredScrollbar(Scrollbar&);
+  void mouseExitedScrollbar(Scrollbar&);
   void mouseCapturedScrollbar();
   void mouseReleasedScrollbar();
-
   void contentAreaDidShow() const;
   void contentAreaDidHide() const;
 
   void finishCurrentScrollAnimations() const;
 
   virtual void didAddScrollbar(Scrollbar&, ScrollbarOrientation);
   virtual void willRemoveScrollbar(Scrollbar&, ScrollbarOrientation);
 
   virtual void contentsResized();
 
-  virtual bool hasOverlayScrollbars() const;
+  bool hasOverlayScrollbars() const;
   void setScrollbarOverlayColorTheme(ScrollbarOverlayColorTheme);
   void recalculateScrollbarOverlayColorTheme(Color);
-  virtual ScrollbarOverlayColorTheme getScrollbarOverlayColorTheme() const {
+  ScrollbarOverlayColorTheme getScrollbarOverlayColorTheme() const {
     return static_cast<ScrollbarOverlayColorTheme>(
         m_scrollbarOverlayColorTheme);
   }
 
   // This getter will create a ScrollAnimatorBase if it doesn't already exist.
   ScrollAnimatorBase& scrollAnimator() const;
 
   // This getter will return null if the ScrollAnimatorBase hasn't been created
   // yet.
   ScrollAnimatorBase* existingScrollAnimator() const {
@@ skipping 20 matching lines @@
   // non-composited elements using fractional scroll offsets is causing too much
   // nasty bugs but does not add too benefit on low-dpi devices.
   // TODO(szager): Now that scroll offsets are floats everywhere, can we get rid
   // of this?
   virtual bool shouldUseIntegerScrollOffset() const {
     return !RuntimeEnabledFeatures::fractionalScrollOffsetsEnabled();
   }
 
   virtual bool isActive() const = 0;
   virtual int scrollSize(ScrollbarOrientation) const = 0;
-  virtual void setScrollbarNeedsPaintInvalidation(ScrollbarOrientation);
+  void setScrollbarNeedsPaintInvalidation(ScrollbarOrientation);
   virtual bool isScrollCornerVisible() const = 0;
   virtual IntRect scrollCornerRect() const = 0;
-  virtual void setScrollCornerNeedsPaintInvalidation();
+  void setScrollCornerNeedsPaintInvalidation();
   virtual void getTickmarks(Vector<IntRect>&) const {}
 
   // Convert points and rects between the scrollbar and its containing Widget.
   // The client needs to implement these in order to be aware of layout effects
   // like CSS transforms.
   virtual IntRect convertFromScrollbarToContainingWidget(
       const Scrollbar& scrollbar,
       const IntRect& scrollbarRect) const {
     return scrollbar.Widget::convertToContainingWidget(scrollbarRect);
   }
   virtual IntRect convertFromContainingWidgetToScrollbar(
       const Scrollbar& scrollbar,
       const IntRect& parentRect) const {
     return scrollbar.Widget::convertFromContainingWidget(parentRect);
   }
   virtual IntPoint convertFromScrollbarToContainingWidget(
       const Scrollbar& scrollbar,
       const IntPoint& scrollbarPoint) const {
     return scrollbar.Widget::convertToContainingWidget(scrollbarPoint);
   }
   virtual IntPoint convertFromContainingWidgetToScrollbar(
       const Scrollbar& scrollbar,
       const IntPoint& parentPoint) const {
     return scrollbar.Widget::convertFromContainingWidget(parentPoint);
   }
 
   virtual Scrollbar* horizontalScrollbar() const { return nullptr; }
   virtual Scrollbar* verticalScrollbar() const { return nullptr; }
 
-  // TODO(crbug.com/661236): This method should be moved to ScrollbarManager
-  // which will update the scrollbars directly for all subclasses.
-  // Called to update the scrollbars to accurately reflect the state of the
-  // view.
-  virtual void updateScrollbars(){};
-
   // scrollPosition is the location of the top/left of the scroll viewport in
   // the coordinate system defined by the top/left of the overflow rect.
   // scrollOffset is the offset of the scroll viewport from its position when
   // scrolled all the way to the beginning of its content's flow.
   // For a more detailed explanation of scrollPosition, scrollOffset, and
   // scrollOrigin, see core/layout/README.md.
   FloatPoint scrollPosition() const {
     return FloatPoint(scrollOrigin()) + scrollOffset();
   }
   virtual IntSize scrollOffsetInt() const = 0;
   virtual ScrollOffset scrollOffset() const {
     return ScrollOffset(scrollOffsetInt());
   }
   virtual IntSize minimumScrollOffsetInt() const = 0;
   virtual ScrollOffset minimumScrollOffset() const {
     return ScrollOffset(minimumScrollOffsetInt());
   }
   virtual IntSize maximumScrollOffsetInt() const = 0;
   virtual ScrollOffset maximumScrollOffset() const {
     return ScrollOffset(maximumScrollOffsetInt());
   }
-  virtual ScrollOffset scrollAnimatorDesiredTargetOffset() const {
-    return scrollAnimator().desiredTargetOffset();
-  }
 
   virtual IntRect visibleContentRect(
       IncludeScrollbarsInRect = ExcludeScrollbars) const;
   virtual int visibleHeight() const { return visibleContentRect().height(); }
   virtual int visibleWidth() const { return visibleContentRect().width(); }
   virtual IntSize contentsSize() const = 0;
   virtual IntPoint lastKnownMousePosition() const { return IntPoint(); }
 
   virtual bool shouldSuspendScrollAnimations() const { return true; }
   virtual void scrollbarStyleChanged() {}
-  // Called when scrollbar hides/shows for overlay scrollbars. This callback
-  // shouldn't do any significant work as it can be called unexpectadly often
-  // on Mac. This happens because painting code has to set alpha to 1, paint,
-  // then reset to alpha, causing spurrious "visibilityChanged" calls.
-  virtual void scrollbarVisibilityChanged() {}
   virtual bool scrollbarsCanBeActive() const = 0;
 
   // Returns the bounding box of this scrollable area, in the coordinate system
   // of the enclosing scroll view.
   virtual IntRect scrollableAreaBoundingBox() const = 0;
 
   virtual bool scrollAnimatorEnabled() const { return false; }
 
   // NOTE: Only called from Internals for testing.
   void updateScrollOffsetFromInternals(const IntSize&);
@@ skipping 141 matching lines @@
   bool scrollCornerNeedsPaintInvalidation() const {
     return m_scrollCornerNeedsPaintInvalidation;
   }
   void clearNeedsPaintInvalidationForScrollControls() {
     m_horizontalScrollbarNeedsPaintInvalidation = false;
     m_verticalScrollbarNeedsPaintInvalidation = false;
     m_scrollCornerNeedsPaintInvalidation = false;
   }
   void showOverlayScrollbars();
 
+  // Called when scrollbar hides/shows for overlay scrollbars. This callback
+  // shouldn't do any significant work as it can be called unexpectadly often
+  // on Mac. This happens because painting code has to set alpha to 1, paint,
+  // then reset to alpha, causing spurrious "visibilityChanged" calls.
+  virtual void scrollbarVisibilityChanged() {}
+
  private:
   void programmaticScrollHelper(const ScrollOffset&, ScrollBehavior);
   void userScrollHelper(const ScrollOffset&, ScrollBehavior);
 
   void fadeOverlayScrollbarsTimerFired(TimerBase*);
 
   // This function should be overriden by subclasses to perform the actual
   // scroll of the content.
   virtual void updateScrollOffset(const ScrollOffset&, ScrollType) = 0;
 
@@ skipping 26 matching lines @@
   // vertical-lr / ltr            NO                      NO
   // vertical-lr / rtl            NO                      YES
   // vertical-rl / ltr            YES                     NO
   // vertical-rl / rtl            YES                     YES
   IntPoint m_scrollOrigin;
 };
 
 }  // namespace blink
 
 #endif  // ScrollableArea_h