Changeset 48500 in webkit

Timestamp:

Sep 17, 2009 10:21:11 PM (15 years ago)

Author:

weinig@apple.com

Message:

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=29276
REGRESSION(r48334): WebKit crashes on file select by drag

Reviewed by Adele Peterson.

Document.elementFromPoint now takes point in client space, not page space.

• page/DragController.cpp:

(WebCore::DragController::tryDocumentDrag):
(WebCore::DragController::concludeEditDrag):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DragController.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-17  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adele Peterson.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=29276
+        REGRESSION(r48334): WebKit crashes on file select by drag
+
+        Document.elementFromPoint now takes point in client space, not page space.
+
+        * page/DragController.cpp:
+        (WebCore::DragController::tryDocumentDrag):
+        (WebCore::DragController::concludeEditDrag):
+
 2009-09-17  Albert J. Wong  <ajwong@chromium.org>
 

trunk/WebCore/page/DragController.cpp

@@ -289 +289 @@
         }
 
-        IntPoint dragPos = dragData->clientPosition();
-        IntPoint point = frameView->windowToContents(dragPos);
+        IntPoint point = frameView->convertFromContainingWindow(dragData->clientPosition());
         Element* element = m_documentUnderMouse->elementFromPoint(point.x(), point.y());
         ASSERT(element);
@@ -341 +340 @@
         return false;
 
-    IntPoint point = m_documentUnderMouse->view()->windowToContents(dragData->clientPosition());
+    IntPoint point = m_documentUnderMouse->view()->convertFromContainingWindow(dragData->clientPosition());
     Element* element =  m_documentUnderMouse->elementFromPoint(point.x(), point.y());
     ASSERT(element);