Move convertViewportToWindow and convertWindowToViewport from

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 2004 matching lines @@
         GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
         webkit_preferences_.enable_scroll_animator);
     has_added_input_handler_ = true;
   }
 }
 
 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);
 }
 
 void RenderViewImpl::didOverscroll(
     const blink::WebFloatSize& overscrollDelta,
     const blink::WebFloatSize& accumulatedOverscroll,
     const blink::WebFloatPoint& positionInViewport,
     const blink::WebFloatSize& velocityInViewport) {
   RenderWidget::didOverscroll(overscrollDelta, accumulatedOverscroll,
@@ skipping 63 matching lines @@
 }
 
 void RenderViewImpl::ClearEditCommands() {
   edit_commands_.clear();
 }
 
 const std::string& RenderViewImpl::GetAcceptLanguages() const {
   return renderer_preferences_.accept_languages;
 }
 
 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(
     const blink::WebElement& element) {
   blink::WebRect bounding_box_in_window = element.boundsInViewport();
   ConvertViewportToWindowViaWidget(&bounding_box_in_window);
   return gfx::RectF(bounding_box_in_window);
 }
 
 bool RenderViewImpl::HasAddedInputHandler() const {
   return has_added_input_handler_;
 }
 
 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);
 }
 
 void RenderViewImpl::didChangeIcon(WebLocalFrame* frame,
                                    WebIconURL::Type icon_type) {
   if (frame->parent())
     return;
 
   WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_type);
   std::vector<FaviconURL> urls;
@@ skipping 935 matching lines @@
         return render_frame->focused_pepper_plugin();
     }
     frame = frame->traverseNext(false);
   }
 
   return nullptr;
 }
 #endif
 
 }  // namespace content