Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1333)

Unified Diff: Source/core/page/DragController.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutMenuList.cpp ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/DragController.cpp
diff --git a/Source/core/page/DragController.cpp b/Source/core/page/DragController.cpp
index 2c4012a10fa3bd52f304e4fa0da2a6708157025f..1c4e2e5d616a7caf17b5e6029227b096b38bd792 100644
--- a/Source/core/page/DragController.cpp
+++ b/Source/core/page/DragController.cpp
@@ -360,7 +360,7 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a
}
if ((actionMask & DragDestinationActionEdit) && canProcessDrag(dragData)) {
- IntPoint point = frameView->windowToContents(dragData->clientPosition());
+ IntPoint point = frameView->rootFrameToContents(dragData->clientPosition());
Element* element = elementUnderMouse(m_documentUnderMouse.get(), point);
if (!element)
return false;
@@ -455,7 +455,7 @@ bool DragController::concludeEditDrag(DragData* dragData)
if (!m_documentUnderMouse)
return false;
- IntPoint point = m_documentUnderMouse->view()->windowToContents(dragData->clientPosition());
+ IntPoint point = m_documentUnderMouse->view()->rootFrameToContents(dragData->clientPosition());
Element* element = elementUnderMouse(m_documentUnderMouse.get(), point);
if (!element)
return false;
@@ -540,7 +540,7 @@ bool DragController::canProcessDrag(DragData* dragData)
if (!dragData->containsCompatibleContent())
return false;
- IntPoint point = m_page->deprecatedLocalMainFrame()->view()->windowToContents(dragData->clientPosition());
+ IntPoint point = m_page->deprecatedLocalMainFrame()->view()->rootFrameToContents(dragData->clientPosition());
HitTestResult result = HitTestResult(point);
if (!m_page->deprecatedLocalMainFrame()->contentRenderer())
return false;
@@ -858,7 +858,7 @@ bool DragController::startDrag(LocalFrame* src, const DragState& state, const Pl
const KURL& linkURL = hitTestResult.absoluteLinkURL();
const KURL& imageURL = hitTestResult.absoluteImageURL();
- IntPoint mouseDraggedPoint = src->view()->windowToContents(dragEvent.position());
+ IntPoint mouseDraggedPoint = src->view()->rootFrameToContents(dragEvent.position());
IntPoint dragLocation;
IntPoint dragOffset;
« no previous file with comments | « Source/core/layout/LayoutMenuList.cpp ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698