Clean up some remaining obsolete coordinate-space naming.

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

 /*
  * Copyright (C) 2004, 2006 Apple Computer, 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 51 matching lines @@
     Widget* parent() const override { return Widget::parent(); }
     Widget* root() const override { return Widget::root(); }
 
     void setFrameRect(const IntRect&) override;
     IntRect frameRect() const override { return Widget::frameRect(); }
 
     ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
     void getTickmarks(Vector<IntRect>&) const override;
     bool isScrollableAreaActive() const override;
 
-    IntPoint convertFromContainingWindow(const IntPoint& windowPoint) const override { return Widget::convertFromContainingWindow(windowPoint); }
+    IntPoint convertFromRootFrame(const IntPoint& pointInRootFrame) const override { return Widget::convertFromRootFrame(pointInRootFrame); }
 
     bool isCustomScrollbar() const override { return false; }
     ScrollbarOrientation orientation() const override { return m_orientation; }
     bool isLeftSideVerticalScrollbar() const override;
 
     int value() const override { return lroundf(m_currentPos); }
     float currentPos() const override { return m_currentPos; }
     int visibleSize() const override { return m_visibleSize; }
     int totalSize() const override { return m_totalSize; }
     int maximum() const override { return m_totalSize - m_visibleSize; }
@@ skipping 37 matching lines @@
     void mouseMoved(const PlatformMouseEvent&);
     void mouseEntered();
     void mouseExited();
 
     // Used by some platform scrollbars to know when they've been released from capture.
     void mouseUp(const PlatformMouseEvent&);
     void mouseDown(const PlatformMouseEvent&);
 
     ScrollbarTheme* theme() const { return m_theme; }
 
-    IntRect convertToContainingView(const IntRect&) const override;
-    IntRect convertFromContainingView(const IntRect&) const override;
+    IntRect convertToContainingWidget(const IntRect&) const override;
+    IntRect convertFromContainingWidget(const IntRect&) const override;
 
-    IntPoint convertToContainingView(const IntPoint&) const override;
-    IntPoint convertFromContainingView(const IntPoint&) const override;
+    IntPoint convertToContainingWidget(const IntPoint&) const override;
+    IntPoint convertFromContainingWidget(const IntPoint&) const override;
 
     void moveThumb(int pos, bool draggingDocument = false);
 
     bool isAlphaLocked() const override { return m_isAlphaLocked; }
     void setIsAlphaLocked(bool flag) override { m_isAlphaLocked = flag; }
 
     float elasticOverscroll() const override { return m_elasticOverscroll; }
     void setElasticOverscroll(float elasticOverscroll) override { m_elasticOverscroll = elasticOverscroll; }
 
     bool trackNeedsRepaint() const override { return m_trackNeedsRepaint; }
@@ skipping 66 matching lines @@
 
     bool m_trackNeedsRepaint;
     bool m_thumbNeedsRepaint;
 };
 
 DEFINE_TYPE_CASTS(Scrollbar, Widget, widget, widget->isScrollbar(), widget.isScrollbar());
 
 } // namespace blink
 
 #endif // Scrollbar_h