Move convertViewportToWindow and convertWindowToViewport from

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 933922495a0985c92a962d90a435c3cae97b7586..384389050e71991e401317810139fb078d0b01c6 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2022,14 +2022,6 @@ void RenderViewImpl::closeWidgetSoon() {
   RenderWidget::closeWidgetSoon();
 }
 
-void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) {
-  RenderWidget::convertViewportToWindow(rect);
-}
-
-void RenderViewImpl::convertWindowToViewport(blink::WebFloatRect* rect) {
-  RenderWidget::convertWindowToViewport(rect);
-}
-
 void RenderViewImpl::didAutoResize(const blink::WebSize& newSize) {
   RenderWidget::DidAutoResize(newSize);
 }
@@ -2114,7 +2106,7 @@ const std::string& RenderViewImpl::GetAcceptLanguages() const {
 }
 
 void RenderViewImpl::ConvertViewportToWindowViaWidget(blink::WebRect* rect) {

[dcheng, 2016/09/02 08:57:39]

These all need to move eventually as well, right?

[lfg, 2016/09/02 17:36:37]

Yes, that's right. However, drag and drop depends on these, so this is not
happening soon.

-  convertViewportToWindow(rect);
+  GetWidget()->convertViewportToWindow(rect);
 }
 
 gfx::RectF RenderViewImpl::ElementBoundsInWindow(
@@ -2131,7 +2123,7 @@ bool RenderViewImpl::HasAddedInputHandler() const {
 gfx::Point RenderViewImpl::ConvertWindowPointToViewport(
     const gfx::Point& point) {
   blink::WebFloatRect point_in_viewport(point.x(), point.y(), 0, 0);
-  convertWindowToViewport(&point_in_viewport);
+  GetWidget()->convertWindowToViewport(&point_in_viewport);
   return gfx::Point(point_in_viewport.x, point_in_viewport.y);
 }