Convert drag event position to root frame.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3691 matching lines @@
     // FIXME: why is the drag scroll timer not stopped here?
 
     m_dragOperation = WebDragOperationNone;
     m_currentDragData = nullptr;
 }
 
 void WebViewImpl::dragTargetDrop(const WebDragData& webDragData, const WebPoint& clientPoint,
     const WebPoint& screenPoint,
     int modifiers)
 {
+    WebPoint clientPointInRootFrame(convertDragEventPointToRootFrame(mainFrameImpl()->frameView(), IntPoint(clientPoint.x, clientPoint.y)));

[bokan, 2016/10/04 23:47:23]

no need for the helper function, just call
page()->frameHost().visualViewport().viewportToRootFrame(clientPoint). This
misses out on DevTools emulation adjustments but that shouldn't be a problem on
Android.

Also, please rename clientPoint to pointInViewport.

[hush (inactive), 2016/10/05 00:24:33]

Done.

+
     DCHECK(m_currentDragData);
     m_currentDragData = DataObject::create(webDragData);
 
     WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autofillClient() : 0;
     UserGestureNotifier notifier(autofillClient, &m_userGestureObserved);
 
     // 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();
         return;
     }
 
     m_currentDragData->setModifiers(modifiers);
     DragData dragData(
         m_currentDragData.get(),
-        clientPoint,
+        clientPointInRootFrame,
         screenPoint,
         static_cast<DragOperation>(m_operationsAllowed));
 
     UserGestureIndicator gesture(DefinitelyProcessingNewUserGesture);
     m_page->dragController().performDrag(&dragData);
 
     m_dragOperation = WebDragOperationNone;
     m_currentDragData = nullptr;
 }
 
@@ skipping 18 matching lines @@
     for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->isLocalFrame())
             toLocalFrame(frame)->removeSpellingMarkersUnderWords(convertedWords);
     }
 }
 
 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPoint, const WebPoint& screenPoint, DragAction dragAction, int modifiers)
 {
     DCHECK(m_currentDragData);
 
+    WebPoint clientPointInRootFrame(convertDragEventPointToRootFrame(mainFrameImpl()->frameView(), IntPoint(clientPoint.x, clientPoint.y)));
+
     m_currentDragData->setModifiers(modifiers);
     DragData dragData(
         m_currentDragData.get(),
-        clientPoint,
+        clientPointInRootFrame,
         screenPoint,
         static_cast<DragOperation>(m_operationsAllowed));
 
     DragSession dragSession;
     if (dragAction == DragEnter)
         dragSession = m_page->dragController().dragEntered(&dragData);
     else
         dragSession = m_page->dragController().dragUpdated(&dragData);
 
     DragOperation dropEffect = dragSession.operation;
@@ skipping 806 matching lines @@
         return nullptr;
     return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
 {
     return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 } // namespace blink