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

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

 /*
  * Copyright (C) 2004, 2006, 2008 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 554 matching lines @@
     return true;
   return !m_scrollableArea->scrollbarsHidden();
 }
 
 bool Scrollbar::isWindowActive() const {
   return m_scrollableArea && m_scrollableArea->isActive();
 }
 
 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);
 }
 
 float Scrollbar::scrollableAreaCurrentPos() const {
   if (!m_scrollableArea)
     return 0;
 
   if (m_orientation == HorizontalScrollbar) {
     return m_scrollableArea->getScrollOffset().width() -
@@ skipping 22 matching lines @@
     invalidParts = AllParts;
   if (invalidParts & ~ThumbPart)
     m_trackNeedsRepaint = true;
   if (invalidParts & ThumbPart)
     m_thumbNeedsRepaint = true;
   if (m_scrollableArea)
     m_scrollableArea->setScrollbarNeedsPaintInvalidation(orientation());
 }
 
 }  // namespace blink