Clean up some remaining obsolete coordinate-space naming.

third_party/WebKit/Source/platform/Widget.h

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Collabora Ltd.  All rights reserved.
  * Copyright (C) 2013 Google 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.
@@ skipping 76 matching lines @@
     virtual bool isPluginContainer() const { return false; }
     virtual bool isScrollbar() const { return false; }
 
     virtual void setParent(Widget*);
     Widget* parent() const { return m_parent; }
     Widget* root() const;
 
     virtual void handleEvent(Event*) { }
 
     // It is important for cross-platform code to realize that Mac has flipped coordinates. Therefore any code
-    // that tries to convert the location of a rect using the point-based convertFromContainingWindow will end
-    // up with an inaccurate rect. Always make sure to use the rect-based convertFromContainingWindow method
+    // that tries to convert the location of a rect using the point-based convertFromRootFrame will end
+    // up with an inaccurate rect. Always make sure to use the rect-based convertFromRootFrame method
     // when converting window rects.
-    IntRect convertToContainingWindow(const IntRect&) const;
-    IntRect convertFromContainingWindow(const IntRect&) const;
+    IntRect convertToRootFrame(const IntRect&) const;
+    IntRect convertFromRootFrame(const IntRect&) const;
 
-    IntPoint convertToContainingWindow(const IntPoint&) const;
-    IntPoint convertFromContainingWindow(const IntPoint&) const;
-    FloatPoint convertFromContainingWindow(const FloatPoint&) const;
+    IntPoint convertToRootFrame(const IntPoint&) const;
+    IntPoint convertFromRootFrame(const IntPoint&) const;
+    FloatPoint convertFromRootFrame(const FloatPoint&) const;
 
     virtual void frameRectsChanged() { }
 
     // Notifies this widget that other widgets on the page have been repositioned.
     virtual void widgetPositionsUpdated() { }
 
-    // Virtual methods to convert points to/from the containing Widget
-    virtual IntRect convertToContainingView(const IntRect&) const;
-    virtual IntRect convertFromContainingView(const IntRect&) const;
-    virtual IntPoint convertToContainingView(const IntPoint&) const;
-    virtual IntPoint convertFromContainingView(const IntPoint&) const;
+    virtual IntRect convertToContainingWidget(const IntRect&) const;
+    virtual IntRect convertFromContainingWidget(const IntRect&) const;
+    virtual IntPoint convertToContainingWidget(const IntPoint&) const;
+    virtual IntPoint convertFromContainingWidget(const IntPoint&) const;
 
     // Virtual methods to convert points to/from child widgets
     virtual IntPoint convertChildToSelf(const Widget*, const IntPoint&) const;
     virtual IntPoint convertSelfToChild(const Widget*, const IntPoint&) const;
 
     // Notifies this widget that it will no longer be receiving events.
     virtual void eventListenersRemoved() { }
 
     DECLARE_VIRTUAL_TRACE();
     virtual void dispose() { }
 
 private:
     RawPtrWillBeMember<Widget> m_parent;
     IntRect m_frame;
     bool m_selfVisible;
     bool m_parentVisible;
 };
 
 } // namespace blink
 
 #endif // Widget_h