Move DIP(WIndow) to Viewport conversion code for drag&drop from browser to renderer

content/browser/renderer_host/render_view_host_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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 664 matching lines @@
     policy->GrantReadFileSystem(renderer_id, filesystem_id);
 
     // Note: We are using the origin URL provided by the sender here. It may be
     // different from the receiver's.
     filtered_data.file_system_files[i].url =
         GURL(storage::GetIsolatedFileSystemRootURIString(
                  file_system_url.origin(), filesystem_id, std::string())
                  .append(register_name));
   }
 
-  const gfx::Point client_pt_in_viewport = ConvertDIPToViewport(client_pt);
-
-  Send(new DragMsg_TargetDragEnter(GetRoutingID(), filtered_data,
-                                   client_pt_in_viewport, screen_pt,
-                                   operations_allowed, key_modifiers));
+  Send(new DragMsg_TargetDragEnter(GetRoutingID(), filtered_data, client_pt,
+                                   screen_pt, operations_allowed,
+                                   key_modifiers));
 }
 
 void RenderViewHostImpl::DragTargetDragOver(
     const gfx::Point& client_pt,
     const gfx::Point& screen_pt,
     WebDragOperationsMask operations_allowed,
     int key_modifiers) {
-  const gfx::Point client_pt_in_viewport = ConvertDIPToViewport(client_pt);
-  Send(new DragMsg_TargetDragOver(GetRoutingID(), client_pt_in_viewport,
-                                  screen_pt, operations_allowed,
-                                  key_modifiers));
+  Send(new DragMsg_TargetDragOver(GetRoutingID(), client_pt, screen_pt,
+                                  operations_allowed, key_modifiers));
 }
 
 void RenderViewHostImpl::DragTargetDragLeave() {
   Send(new DragMsg_TargetDragLeave(GetRoutingID()));
 }
 
 void RenderViewHostImpl::DragTargetDrop(
     const gfx::Point& client_pt,
     const gfx::Point& screen_pt,
     int key_modifiers) {
-  const gfx::Point client_pt_in_viewport = ConvertDIPToViewport(client_pt);
-  Send(new DragMsg_TargetDrop(GetRoutingID(), client_pt_in_viewport, screen_pt,
+  Send(new DragMsg_TargetDrop(GetRoutingID(), client_pt, screen_pt,
                               key_modifiers));
 }
 
 void RenderViewHostImpl::DragSourceEndedAt(
     int client_x, int client_y, int screen_x, int screen_y,
     WebDragOperation operation) {
-  const gfx::Point client_pt_in_viewport =
-      ConvertDIPToViewport(gfx::Point(client_x, client_y));
-  Send(new DragMsg_SourceEnded(GetRoutingID(), client_pt_in_viewport,
-                               gfx::Point(screen_x, screen_y), operation));
+  Send(new DragMsg_SourceEnded(GetRoutingID(),
+                               gfx::Point(client_x, client_y),
+                               gfx::Point(screen_x, screen_y),
+                               operation));
 }
 
 void RenderViewHostImpl::DragSourceSystemDragEnded() {
   Send(new DragMsg_SourceSystemDragEnded(GetRoutingID()));
 }
 
 bool RenderViewHostImpl::Send(IPC::Message* msg) {
   return GetWidget()->Send(msg);
 }
 
@@ skipping 628 matching lines @@
                    weak_factory_.GetWeakPtr()));
   } else {
     render_view_ready_on_process_launch_ = true;
   }
 }
 
 void RenderViewHostImpl::RenderViewReady() {
   delegate_->RenderViewReady(this);
 }
 
-gfx::Point RenderViewHostImpl::ConvertDIPToViewport(const gfx::Point& point) {
-  // The point in guest view is already converted.
-  if (!render_widget_host_->scale_input_to_viewport())
-    return point;
-  float scale = GetWidget()->GetView()->current_device_scale_factor();
-  return gfx::Point(point.x() * scale, point.y() * scale);
-}
-
 }  // namespace content