Rename ScrollableArea fields and methods *Widget* to ...FrameViewBase...

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 4460 matching lines @@
                            ? m_horizontalScrollbarMode
                            : m_verticalScrollbarMode;
 
   return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn;
 }
 
 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const {
   return false;
 }
 
-FrameViewBase* FrameView::getWidget() {
+FrameViewBase* FrameView::getFrameViewBase() {
   return this;
 }
 
 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent,
                                      const ScrollAlignment& alignX,
                                      const ScrollAlignment& alignY,
                                      ScrollType scrollType) {
   LayoutRect viewRect(visibleContentRect());
   LayoutRect exposeRect =
       ScrollAlignment::getRectToExpose(viewRect, rectInContent, alignX, alignY);
@@ skipping 95 matching lines @@
          framePoint.x() < verticalScrollbarXMax &&
          framePoint.y() > verticalScrollbarYMin;
 }
 
 bool FrameView::scrollbarCornerPresent() const {
   return (horizontalScrollbar() &&
           width() - horizontalScrollbar()->width() > 0) ||
          (verticalScrollbar() && height() - verticalScrollbar()->height() > 0);
 }
 
-IntRect FrameView::convertFromScrollbarToContainingWidget(
+IntRect FrameView::convertFromScrollbarToContainingFrameViewBase(
     const Scrollbar& scrollbar,
     const IntRect& localRect) const {
   // Scrollbars won't be transformed within us
   IntRect newRect = localRect;
   newRect.moveBy(scrollbar.location());
   return newRect;
 }
 
-IntRect FrameView::convertFromContainingWidgetToScrollbar(
+IntRect FrameView::convertFromContainingFrameViewBaseToScrollbar(
     const Scrollbar& scrollbar,
     const IntRect& parentRect) const {
   IntRect newRect = parentRect;
   // Scrollbars won't be transformed within us
   newRect.moveBy(-scrollbar.location());
   return newRect;
 }
 
 // FIXME: test these on windows
-IntPoint FrameView::convertFromScrollbarToContainingWidget(
+IntPoint FrameView::convertFromScrollbarToContainingFrameViewBase(
     const Scrollbar& scrollbar,
     const IntPoint& localPoint) const {
   // Scrollbars won't be transformed within us
   IntPoint newPoint = localPoint;
   newPoint.moveBy(scrollbar.location());
   return newPoint;
 }
 
-IntPoint FrameView::convertFromContainingWidgetToScrollbar(
+IntPoint FrameView::convertFromContainingFrameViewBaseToScrollbar(
     const Scrollbar& scrollbar,
     const IntPoint& parentPoint) const {
   IntPoint newPoint = parentPoint;
   // Scrollbars won't be transformed within us
   newPoint.moveBy(-scrollbar.location());
   return newPoint;
 }
 
 static void setNeedsCompositingUpdate(LayoutViewItem layoutViewItem,
                                       CompositingUpdateType updateType) {
@@ skipping 614 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink