Clean up some remaining obsolete coordinate-space naming.

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 318 matching lines @@
         || m_hoveredPart != NoPart)
         setNeedsPaintInvalidation();
     m_pressedPart = part;
 }
 
 bool Scrollbar::gestureEvent(const PlatformGestureEvent& evt)
 {
     switch (evt.type()) {
     case PlatformEvent::GestureTapDown:
         setPressedPart(theme()->hitTest(this, evt.position()));
-        m_pressedPos = orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.position()).x() : convertFromContainingWindow(evt.position()).y();
+        m_pressedPos = orientation() == HorizontalScrollbar ? convertFromRootFrame(evt.position()).x() : convertFromRootFrame(evt.position()).y();
         return true;
     case PlatformEvent::GestureTapDownCancel:
     case PlatformEvent::GestureScrollBegin:
         if (m_pressedPart != ThumbPart)
             return false;
         m_scrollPos = m_pressedPos;
         return true;
     case PlatformEvent::GestureScrollUpdate:
         if (m_pressedPart != ThumbPart)
             return false;
@@ skipping 24 matching lines @@
 }
 
 void Scrollbar::mouseMoved(const PlatformMouseEvent& evt)
 {
     if (m_pressedPart == ThumbPart) {
         if (theme()->shouldSnapBackToDragOrigin(this, evt)) {
             if (m_scrollableArea) {
                 m_scrollableArea->setScrollPositionSingleAxis(m_orientation, m_dragOrigin + m_scrollableArea->minimumScrollPosition(m_orientation), UserScroll);
             }
         } else {
-            moveThumb(m_orientation == HorizontalScrollbar ?
-                      convertFromContainingWindow(evt.position()).x() :
-                      convertFromContainingWindow(evt.position()).y(), theme()->shouldDragDocumentInsteadOfThumb(this, evt));
+            moveThumb(m_orientation == HorizontalScrollbar
+                ? convertFromRootFrame(evt.position()).x()
+                : convertFromRootFrame(evt.position()).y(), theme()->shouldDragDocumentInsteadOfThumb(this, evt));
         }
         return;
     }
 
     if (m_pressedPart != NoPart)
-        m_pressedPos = orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.position()).x() : convertFromContainingWindow(evt.position()).y();
+        m_pressedPos = orientation() == HorizontalScrollbar ? convertFromRootFrame(evt.position()).x() : convertFromRootFrame(evt.position()).y();
 
     ScrollbarPart part = theme()->hitTest(this, evt.position());
     if (part != m_hoveredPart) {
         if (m_pressedPart != NoPart) {
             if (part == m_pressedPart) {
                 // The mouse is moving back over the pressed part.  We
                 // need to start up the timer action again.
                 startTimerIfNeeded(theme()->autoscrollTimerDelay());
                 setNeedsPaintInvalidation();
             } else if (m_hoveredPart == m_pressedPart) {
@@ skipping 39 matching lines @@
     }
 }
 
 void Scrollbar::mouseDown(const PlatformMouseEvent& evt)
 {
     // Early exit for right click
     if (evt.button() == RightButton)
         return;
 
     setPressedPart(theme()->hitTest(this, evt.position()));
-    int pressedPos = orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.position()).x() : convertFromContainingWindow(evt.position()).y();
+    int pressedPos = orientation() == HorizontalScrollbar ? convertFromRootFrame(evt.position()).x() : convertFromRootFrame(evt.position()).y();
 
     if ((m_pressedPart == BackTrackPart || m_pressedPart == ForwardTrackPart) && theme()->shouldCenterOnThumb(this, evt)) {
         setHoveredPart(ThumbPart);
         setPressedPart(ThumbPart);
         m_dragOrigin = m_currentPos;
         int thumbLen = theme()->thumbLength(this);
         int desiredPos = pressedPos;
         // Set the pressed position to the middle of the thumb so that when we do the move, the delta
         // will be from the current pixel position of the thumb to the new desired position for the thumb.
         m_pressedPos = theme()->trackPosition(this) + theme()->thumbPosition(this) + thumbLen / 2;
@@ skipping 48 matching lines @@
         invalidate();
     }
 #endif
 }
 
 bool Scrollbar::isWindowActive() const
 {
     return m_scrollableArea && m_scrollableArea->isActive();
 }
 
-IntRect Scrollbar::convertToContainingView(const IntRect& localRect) const
+IntRect Scrollbar::convertToContainingWidget(const IntRect& localRect) const
 {
     if (m_scrollableArea)
-        return m_scrollableArea->convertFromScrollbarToContainingView(this, localRect);
+        return m_scrollableArea->convertFromScrollbarToContainingWidget(this, localRect);
 
-    return Widget::convertToContainingView(localRect);
+    return Widget::convertToContainingWidget(localRect);
 }
 
-IntRect Scrollbar::convertFromContainingView(const IntRect& parentRect) const
+IntRect Scrollbar::convertFromContainingWidget(const IntRect& parentRect) const
 {
     if (m_scrollableArea)
-        return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentRect);
+        return m_scrollableArea->convertFromContainingWidgetToScrollbar(this, parentRect);
 
-    return Widget::convertFromContainingView(parentRect);
+    return Widget::convertFromContainingWidget(parentRect);
 }
 
-IntPoint Scrollbar::convertToContainingView(const IntPoint& localPoint) const
+IntPoint Scrollbar::convertToContainingWidget(const IntPoint& localPoint) const
 {
     if (m_scrollableArea)
-        return m_scrollableArea->convertFromScrollbarToContainingView(this, localPoint);
+        return m_scrollableArea->convertFromScrollbarToContainingWidget(this, localPoint);
 
-    return Widget::convertToContainingView(localPoint);
+    return Widget::convertToContainingWidget(localPoint);
 }
 
-IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const
+IntPoint Scrollbar::convertFromContainingWidget(const IntPoint& parentPoint) const
 {
     if (m_scrollableArea)
-        return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentPoint);
+        return m_scrollableArea->convertFromContainingWidgetToScrollbar(this, parentPoint);
 
-    return Widget::convertFromContainingView(parentPoint);
+    return Widget::convertFromContainingWidget(parentPoint);
 }
 
 float Scrollbar::scrollableAreaCurrentPos() const
 {
     if (!m_scrollableArea)
         return 0;
 
     if (m_orientation == HorizontalScrollbar)
         return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimumScrollPosition().x();
 
     return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScrollPosition().y();
 }
 
 void Scrollbar::setNeedsPaintInvalidation()
 {
     if (m_theme->shouldRepaintAllPartsOnInvalidation()) {
         m_trackNeedsRepaint = true;
         m_thumbNeedsRepaint = true;
     }
     if (m_scrollableArea)
         m_scrollableArea->setScrollbarNeedsPaintInvalidation(this);
 }
 
 } // namespace blink