Correctly set dragLeave and dragEnd coords for OOPIF drag and drop

content/browser/web_contents/web_drag_dest_mac.mm

Index: content/browser/web_contents/web_drag_dest_mac.mm
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
index 458b01aaeedaa1d829cdc852a0a93d553d3c3523..76b59fbae039684f5cee49f664e4af4c7611ed09 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -10,6 +10,7 @@
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
@@ -215,7 +216,7 @@ content::GlobalRoutingID GetRenderViewHostID(content::RenderViewHost* rvh) {
     delegate_->OnDragLeave();
 
   if (currentRWHForDrag_) {
-    currentRWHForDrag_->DragTargetDragLeave();
+    currentRWHForDrag_->DragTargetDragLeave(gfx::Point(), gfx::Point());
     currentRWHForDrag_.reset();
   }
   dropData_.reset();
@@ -243,8 +244,27 @@ content::GlobalRoutingID GetRenderViewHostID(content::RenderViewHost* rvh) {
   // TODO(paulmeyer): The dragging delegates may now by invoked multiple times
   // per drag, even without the drag ever leaving the window.
   if (targetRWH != currentRWHForDrag_.get()) {
-    if (currentRWHForDrag_)
-      currentRWHForDrag_->DragTargetDragLeave();
+    if (currentRWHForDrag_) {
+      gfx::Point transformedLeavePoint = gfx::Point(viewPoint.x, viewPoint.y);
+      gfx::Point transformedScreenPoint =
+          gfx::Point(screenPoint.x, screenPoint.y);
+      static_cast<content::RenderWidgetHostViewBase*>(
+          webContents_->GetRenderWidgetHostView())
+          ->TransformPointToCoordSpaceForView(
+              transformedLeavePoint,
+              static_cast<content::RenderWidgetHostViewBase*>(
+                  currentRWHForDrag_->GetView()),
+              &transformedLeavePoint);
+      static_cast<content::RenderWidgetHostViewBase*>(
+          webContents_->GetRenderWidgetHostView())
+          ->TransformPointToCoordSpaceForView(
+              transformedScreenPoint,
+              static_cast<content::RenderWidgetHostViewBase*>(
+                  currentRWHForDrag_->GetView()),
+              &transformedScreenPoint);
+      currentRWHForDrag_->DragTargetDragLeave(transformedLeavePoint,
+                                              transformedScreenPoint);
+    }
     [self draggingEntered:info view:view];
   }
 
@@ -284,7 +304,8 @@ content::GlobalRoutingID GetRenderViewHostID(content::RenderViewHost* rvh) {
 
   if (targetRWH != currentRWHForDrag_.get()) {
     if (currentRWHForDrag_)
-      currentRWHForDrag_->DragTargetDragLeave();
+      currentRWHForDrag_->DragTargetDragLeave(
+          transformedPt, gfx::Point(screenPoint.x, screenPoint.y));
     [self draggingEntered:info view:view];
   }