Correctly set dragLeave and dragEnd coords for OOPIF drag and drop

content/browser/web_contents/web_drag_dest_mac.mm

 // 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.
 
 #import "content/browser/web_contents/web_drag_dest_mac.h"
 
 #import <Carbon/Carbon.h>
 
 #include "base/strings/sys_string_conversions.h"
 #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"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/drop_data.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
@@ skipping 185 matching lines @@
   if (canceled_)
     return;
 
   if ([self onlyAllowsNavigation])
     return;
 
   if (delegate_)
     delegate_->OnDragLeave();
 
   if (currentRWHForDrag_) {
-    currentRWHForDrag_->DragTargetDragLeave();
+    currentRWHForDrag_->DragTargetDragLeave(gfx::Point(), gfx::Point());
     currentRWHForDrag_.reset();
   }
   dropData_.reset();
 }
 
 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)info view:(NSView*)view {
   if (canceled_) {
     // TODO(ekaramad,paulmeyer): We probably shouldn't be checking for
     // |canceled_| twice in this method.
     return NSDragOperationNone;
   }
 
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates. Both need to be flipped.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   gfx::Point transformedPt;
   content::RenderWidgetHostImpl* targetRWH =
       [self GetRenderWidgetHostAtPoint:viewPoint transformedPt:&transformedPt];
 
   if (![self isValidDragTarget:targetRWH])
     return NSDragOperationNone;
 
   // 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);
+      content::RenderWidgetHostViewBase* rootView =
+          static_cast<content::RenderWidgetHostViewBase*>(
+              webContents_->GetRenderWidgetHostView());
+      content::RenderWidgetHostViewBase* currentDragView =
+          static_cast<content::RenderWidgetHostViewBase*>(
+              currentRWHForDrag_->GetView());
+      rootView->TransformPointToCoordSpaceForView(
+          transformedLeavePoint, currentDragView, &transformedLeavePoint);
+      rootView->TransformPointToCoordSpaceForView(
+          transformedScreenPoint, currentDragView, &transformedScreenPoint);
+      currentRWHForDrag_->DragTargetDragLeave(transformedLeavePoint,
+                                              transformedScreenPoint);
+    }
     [self draggingEntered:info view:view];
   }
 
   if (canceled_)
     return NSDragOperationNone;
 
   if ([self onlyAllowsNavigation]) {
     if ([[info draggingPasteboard] containsURLDataConvertingTextToURL:YES])
       return NSDragOperationCopy;
     return NSDragOperationNone;
@@ skipping 19 matching lines @@
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   gfx::Point transformedPt;
   content::RenderWidgetHostImpl* targetRWH =
       [self GetRenderWidgetHostAtPoint:viewPoint transformedPt:&transformedPt];
 
   if (![self isValidDragTarget:targetRWH])
     return NO;
 
   if (targetRWH != currentRWHForDrag_.get()) {
     if (currentRWHForDrag_)
-      currentRWHForDrag_->DragTargetDragLeave();
+      currentRWHForDrag_->DragTargetDragLeave(
+          transformedPt, gfx::Point(screenPoint.x, screenPoint.y));
     [self draggingEntered:info view:view];
   }
 
   // Check if we only allow navigation and navigate to a url on the pasteboard.
   if ([self onlyAllowsNavigation]) {
     NSPasteboard* pboard = [info draggingPasteboard];
     if ([pboard containsURLDataConvertingTextToURL:YES]) {
       GURL url;
       ui::PopulateURLAndTitleFromPasteboard(&url, NULL, pboard, YES);
       webContents_->OpenURL(
@@ skipping 98 matching lines @@
   // Get custom MIME data.
   if ([types containsObject:ui::kWebCustomDataPboardType]) {
     NSData* customData = [pboard dataForType:ui::kWebCustomDataPboardType];
     ui::ReadCustomDataIntoMap([customData bytes],
                               [customData length],
                               &data->custom_data);
   }
 }
 
 @end