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

third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

Index: third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
index 5f01f0ca53e346fbe7d8c63a591e83c4283df349..a3dba61d2e9123793929f28f84c13ddbbc9a166e 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -572,36 +572,40 @@ bool Scrollbar::isWindowActive() const {
 
 IntRect Scrollbar::convertToContainingFrameViewBase(
     const IntRect& localRect) const {
-  if (m_scrollableArea)
-    return m_scrollableArea->convertFromScrollbarToContainingWidget(*this,
-                                                                    localRect);
+  if (m_scrollableArea) {
+    return m_scrollableArea->convertFromScrollbarToContainingFrameViewBase(
+        *this, localRect);
+  }
 
   return FrameViewBase::convertToContainingFrameViewBase(localRect);
 }
 
 IntRect Scrollbar::convertFromContainingFrameViewBase(
     const IntRect& parentRect) const {
-  if (m_scrollableArea)
-    return m_scrollableArea->convertFromContainingWidgetToScrollbar(*this,
-                                                                    parentRect);
+  if (m_scrollableArea) {
+    return m_scrollableArea->convertFromContainingFrameViewBaseToScrollbar(
+        *this, parentRect);
+  }
 
   return FrameViewBase::convertFromContainingFrameViewBase(parentRect);
 }
 
 IntPoint Scrollbar::convertToContainingFrameViewBase(
     const IntPoint& localPoint) const {
-  if (m_scrollableArea)
-    return m_scrollableArea->convertFromScrollbarToContainingWidget(*this,
-                                                                    localPoint);
+  if (m_scrollableArea) {
+    return m_scrollableArea->convertFromScrollbarToContainingFrameViewBase(
+        *this, localPoint);
+  }
 
   return FrameViewBase::convertToContainingFrameViewBase(localPoint);
 }
 
 IntPoint Scrollbar::convertFromContainingFrameViewBase(
     const IntPoint& parentPoint) const {
-  if (m_scrollableArea)
-    return m_scrollableArea->convertFromContainingWidgetToScrollbar(
+  if (m_scrollableArea) {
+    return m_scrollableArea->convertFromContainingFrameViewBaseToScrollbar(
         *this, parentPoint);
+  }
 
   return FrameViewBase::convertFromContainingFrameViewBase(parentPoint);
 }