Correctly set dragLeave and dragEnd coords for OOPIF drag and drop

third_party/WebKit/Source/web/WebFrameWidgetBase.cpp

 // Copyright 2016 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 "web/WebFrameWidgetBase.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/VisualViewport.h"
 #include "core/input/EventHandler.h"
 #include "core/page/DragActions.h"
@@ skipping 54 matching lines @@
     const WebPoint& pointInViewport,
     const WebPoint& screenPoint,
     WebDragOperationsMask operationsAllowed,
     int modifiers) {
   m_operationsAllowed = operationsAllowed;
 
   return dragTargetDragEnterOrOver(pointInViewport, screenPoint, DragOver,
                                    modifiers);
 }
 
-void WebFrameWidgetBase::dragTargetDragLeave() {
+void WebFrameWidgetBase::dragTargetDragLeave(const WebPoint& pointInViewport,
+                                             const WebPoint& screenPoint) {
   DCHECK(m_currentDragData);
 
   if (ignoreInputEvents()) {
     cancelDrag();
     return;
   }
-  DragData dragData(m_currentDragData.get(), IntPoint(), IntPoint(),
+
+  WebPoint pointInRootFrame(viewportToRootFrame(pointInViewport));
+  DragData dragData(m_currentDragData.get(), pointInRootFrame, screenPoint,
                     static_cast<DragOperation>(m_operationsAllowed));
 
   page()->dragController().dragExited(&dragData, *toCoreFrame(localRoot()));
 
   // FIXME: why is the drag scroll timer not stopped here?
 
   m_dragOperation = WebDragOperationNone;
   m_currentDragData = nullptr;
 }
 
 void WebFrameWidgetBase::dragTargetDrop(const WebDragData& webDragData,
                                         const WebPoint& pointInViewport,
                                         const WebPoint& screenPoint,
                                         int modifiers) {
   WebPoint pointInRootFrame(viewportToRootFrame(pointInViewport));
 
   DCHECK(m_currentDragData);
   m_currentDragData = DataObject::create(webDragData);
   WebViewImpl::UserGestureNotifier notifier(view());
 
   // If this webview transitions from the "drop accepting" state to the "not
   // accepting" state, then our IPC message reply indicating that may be in-
   // flight, or else delayed by javascript processing in this webview.  If a
   // drop happens before our IPC reply has reached the browser process, then
   // the browser forwards the drop to this webview.  So only allow a drop to
   // proceed if our webview m_dragOperation state is not DragOperationNone.
 
   if (m_dragOperation == WebDragOperationNone) {
     // IPC RACE CONDITION: do not allow this drop.
-    dragTargetDragLeave();
+    dragTargetDragLeave(pointInViewport, screenPoint);
     return;
   }
 
   if (!ignoreInputEvents()) {
     m_currentDragData->setModifiers(modifiers);
     DragData dragData(m_currentDragData.get(), pointInRootFrame, screenPoint,
                       static_cast<DragOperation>(m_operationsAllowed));
 
     page()->dragController().performDrag(&dragData, *toCoreFrame(localRoot()));
   }
@@ skipping 86 matching lines @@
 
 WebViewImpl* WebFrameWidgetBase::view() const {
   return toWebLocalFrameImpl(localRoot())->viewImpl();
 }
 
 Page* WebFrameWidgetBase::page() const {
   return view()->page();
 }
 
 }  // namespace blink