Reviewed by Richard

        <rdar://problem/3748323> Problem with -[WebView editableDOMRangeForPoint:] (-isFlipped not taken into account?)
        <rdar://problem/3852590> REGRESSION (Mail): Dropped content appears in wrong place if Mail message is scrolled down

        When implementing drag and drop, moveDragCaretToPoint: and editableDOMRangeForPoint: are used in
        concert to track the mouse and determine a drop location, respectively. However, moveDragCaretToPoint:
        did a conversion of the passed-in point to the document view's coordinate space, whereas
        editableDOMRangeForPoint: did not. Now it does.

        Note that I will need to coordinate with Grant to have him roll out some code in Mail that
        attempts to work around this problem (unsuccessfully), and actually manages to block the
        real fix (which needs to be in WebKit).

        * WebView.subproj/WebView.m:
        (-[WebView editableDOMRangeForPoint:]): Convert the passed-in point to the document view's coordinate space.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b4a6cfa6831382162300ae019d4bc329afba74d6..56d27ac0cf6de8c0b5664a04e6e4408a2670397d 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2004-12-02  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by Richard
+
+        <rdar://problem/3748323> Problem with -[WebView editableDOMRangeForPoint:] (-isFlipped not taken into account?)
+        <rdar://problem/3852590> REGRESSION (Mail): Dropped content appears in wrong place if Mail message is scrolled down
+
+        When implementing drag and drop, moveDragCaretToPoint: and editableDOMRangeForPoint: are used in
+        concert to track the mouse and determine a drop location, respectively. However, moveDragCaretToPoint:
+        did a conversion of the passed-in point to the document view's coordinate space, whereas 
+        editableDOMRangeForPoint: did not. Now it does.
+        
+        Note that I will need to coordinate with Grant to have him roll out some code in Mail that
+        attempts to work around this problem (unsuccessfully), and actually manages to block the
+        real fix (which needs to be in WebKit).
+
+        * WebView.subproj/WebView.m:
+        (-[WebView editableDOMRangeForPoint:]): Convert the passed-in point to the document view's coordinate space.
+
 2004-12-02  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/3895810> FATAL ERROR: <WebTextRenderer: 0x9328a20> unable to initialize with font "Times-Roman 16.00 pt. S ....

diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index c0b056892146e9869aebb9904f0b3403b2ceffdf..60ec43c9a8eee15950c444eab5d42852fe9b9abb 100644 (file)
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2503,7 +2503,8 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 
 - (DOMRange *)editableDOMRangeForPoint:(NSPoint)point
 {
-    return [[self _bridgeAtPoint:point] editableDOMRangeForPoint:point];
+    WebBridge *bridge = [self _bridgeAtPoint:point];
+    return [bridge editableDOMRangeForPoint:[self convertPoint:point toView:[[[bridge webFrame] frameView] documentView]]];
 }
 
 - (BOOL)_shouldBeginEditingInDOMRange:(DOMRange *)range