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

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: Addressed rbyers@ feedback (minus tests) 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
Index: Source/core/page/DragController.cpp
diff --git a/Source/core/page/DragController.cpp b/Source/core/page/DragController.cpp
index 8c2c961841c10f3eb57ca76ac5b33b19e6511607..b19d2e6062f7b75ccee834fecd7b95945f4a39f2 100644
--- a/Source/core/page/DragController.cpp
+++ b/Source/core/page/DragController.cpp
@@ -365,7 +365,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;
@@ -460,7 +460,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;
@@ -545,7 +545,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;
@@ -863,7 +863,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;

Powered by Google App Engine
This is Rietveld 408576698