| Index: third_party/WebKit/Source/web/WebFrameWidgetBase.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebFrameWidgetBase.cpp b/third_party/WebKit/Source/web/WebFrameWidgetBase.cpp
|
| index 5a34a0e3281039667f871319d29c9432646d5c91..79e51fc74f47f7e990c4f1dec0e24542238a19db 100644
|
| --- a/third_party/WebKit/Source/web/WebFrameWidgetBase.cpp
|
| +++ b/third_party/WebKit/Source/web/WebFrameWidgetBase.cpp
|
| @@ -72,14 +72,17 @@ WebDragOperation WebFrameWidgetBase::dragTargetDragOver(
|
| 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()));
|
| @@ -109,7 +112,7 @@ void WebFrameWidgetBase::dragTargetDrop(const WebDragData& webDragData,
|
|
|
| if (m_dragOperation == WebDragOperationNone) {
|
| // IPC RACE CONDITION: do not allow this drop.
|
| - dragTargetDragLeave();
|
| + dragTargetDragLeave(pointInViewport, screenPoint);
|
| return;
|
| }
|
|
|
|
|