Clean up some remaining obsolete coordinate-space naming.

third_party/WebKit/Source/platform/Widget.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 52 matching lines @@
 Widget* Widget::root() const
 {
     const Widget* top = this;
     while (top->parent())
         top = top->parent();
     if (top->isFrameView())
         return const_cast<Widget*>(static_cast<const Widget*>(top));
     return 0;
 }
 
-IntRect Widget::convertFromContainingWindow(const IntRect& windowRect) const
+IntRect Widget::convertFromRootFrame(const IntRect& rectInRootFrame) const
 {
     if (const Widget* parentWidget = parent()) {
-        IntRect parentRect = parentWidget->convertFromContainingWindow(windowRect);
-        return convertFromContainingView(parentRect);
+        IntRect parentRect = parentWidget->convertFromRootFrame(rectInRootFrame);
+        return convertFromContainingWidget(parentRect);
     }
-    return windowRect;
+    return rectInRootFrame;
 }
 
-IntRect Widget::convertToContainingWindow(const IntRect& localRect) const
+IntRect Widget::convertToRootFrame(const IntRect& localRect) const
 {
     if (const Widget* parentWidget = parent()) {
-        IntRect parentRect = convertToContainingView(localRect);
-        return parentWidget->convertToContainingWindow(parentRect);
+        IntRect parentRect = convertToContainingWidget(localRect);
+        return parentWidget->convertToRootFrame(parentRect);
     }
     return localRect;
 }
 
-IntPoint Widget::convertFromContainingWindow(const IntPoint& windowPoint) const
+IntPoint Widget::convertFromRootFrame(const IntPoint& pointInRootFrame) const
 {
     if (const Widget* parentWidget = parent()) {
-        IntPoint parentPoint = parentWidget->convertFromContainingWindow(windowPoint);
-        return convertFromContainingView(parentPoint);
+        IntPoint parentPoint = parentWidget->convertFromRootFrame(pointInRootFrame);
+        return convertFromContainingWidget(parentPoint);
     }
-    return windowPoint;
+    return pointInRootFrame;
 }
 
-FloatPoint Widget::convertFromContainingWindow(const FloatPoint& windowPoint) const
+FloatPoint Widget::convertFromRootFrame(const FloatPoint& pointInRootFrame) const
 {
     // Widgets / windows are required to be IntPoint aligned, but we may need to convert
     // FloatPoint values within them (eg. for event co-ordinates).
-    IntPoint flooredPoint = flooredIntPoint(windowPoint);
-    FloatPoint parentPoint = this->convertFromContainingWindow(flooredPoint);
-    FloatSize windowFraction = windowPoint - flooredPoint;
+    IntPoint flooredPoint = flooredIntPoint(pointInRootFrame);
+    FloatPoint parentPoint = this->convertFromRootFrame(flooredPoint);
+    FloatSize windowFraction = pointInRootFrame - flooredPoint;
     // Use linear interpolation handle any fractional value (eg. for iframes subject to a transform
     // beyond just a simple translation).
     // FIXME: Add FloatPoint variants of all co-ordinate space conversion APIs.
     if (!windowFraction.isEmpty()) {
         const int kFactor = 1000;
-        IntPoint parentLineEnd = this->convertFromContainingWindow(flooredPoint + roundedIntSize(windowFraction.scaledBy(kFactor)));
+        IntPoint parentLineEnd = this->convertFromRootFrame(flooredPoint + roundedIntSize(windowFraction.scaledBy(kFactor)));
         FloatSize parentFraction = (parentLineEnd - parentPoint).scaledBy(1.0f / kFactor);
         parentPoint.move(parentFraction);
     }
     return parentPoint;
 }
 
-IntPoint Widget::convertToContainingWindow(const IntPoint& localPoint) const
+IntPoint Widget::convertToRootFrame(const IntPoint& localPoint) const
 {
     if (const Widget* parentWidget = parent()) {
-        IntPoint parentPoint = convertToContainingView(localPoint);
-        return parentWidget->convertToContainingWindow(parentPoint);
+        IntPoint parentPoint = convertToContainingWidget(localPoint);
+        return parentWidget->convertToRootFrame(parentPoint);
     }
     return localPoint;
 }
 
-IntRect Widget::convertToContainingView(const IntRect& localRect) const
+IntRect Widget::convertToContainingWidget(const IntRect& localRect) const
 {
     if (const Widget* parentWidget = parent()) {
         IntRect parentRect(localRect);
         parentRect.setLocation(parentWidget->convertChildToSelf(this, localRect.location()));
         return parentRect;
     }
     return localRect;
 }
 
-IntRect Widget::convertFromContainingView(const IntRect& parentRect) const
+IntRect Widget::convertFromContainingWidget(const IntRect& parentRect) const
 {
     if (const Widget* parentWidget = parent()) {
         IntRect localRect = parentRect;
         localRect.setLocation(parentWidget->convertSelfToChild(this, localRect.location()));
         return localRect;
     }
 
     return parentRect;
 }
 
-IntPoint Widget::convertToContainingView(const IntPoint& localPoint) const
+IntPoint Widget::convertToContainingWidget(const IntPoint& localPoint) const
 {
     if (const Widget* parentWidget = parent())
         return parentWidget->convertChildToSelf(this, localPoint);
 
     return localPoint;
 }
 
-IntPoint Widget::convertFromContainingView(const IntPoint& parentPoint) const
+IntPoint Widget::convertFromContainingWidget(const IntPoint& parentPoint) const
 {
     if (const Widget* parentWidget = parent())
         return parentWidget->convertSelfToChild(this, parentPoint);
 
     return parentPoint;
 }
 
 IntPoint Widget::convertChildToSelf(const Widget*, const IntPoint& point) const
 {
     return point;
 }
 
 IntPoint Widget::convertSelfToChild(const Widget*, const IntPoint& point) const
 {
     return point;
 }
 
 } // namespace blink