Temp fix for: <rdar://problem/3814810> REGRESSION (125-164): Exception adding nil...
authorcblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Sep 2004 20:34:13 +0000 (20:34 +0000)
committercblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Sep 2004 20:34:13 +0000 (20:34 +0000)
        Reviewed by john.

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView _delegateDragSourceActionMask]): return none if the mouse down event is nil

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

WebKit/ChangeLog
WebKit/WebView.subproj/WebHTMLView.m

index 25481ef672519b8dd038f0d1ad6e4e4590904809..d13833c7bb02f9dfa6e148e1cf9bfe8dc4e2d026 100644 (file)
@@ -1,3 +1,12 @@
+2004-09-24  Chris Blumenberg  <cblu@apple.com>
+
+       Temp fix for: <rdar://problem/3814810> REGRESSION (125-164): Exception adding nil to dictionary in dragging code
+
+        Reviewed by john.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _delegateDragSourceActionMask]): return none if the mouse down event is nil
+
 2004-09-24  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John
 2004-09-24  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John
index 62c7383be27ac23f4dd6cfc74ebd68d9f2c49e6d..213dcaac4c4ba9871bf3ecf26f4fb0bf6785cf8b 100644 (file)
@@ -3978,6 +3978,10 @@ static DOMRange *unionDOMRanges(DOMRange *a, DOMRange *b)
 
 - (unsigned int)_delegateDragSourceActionMask
 {
 
 - (unsigned int)_delegateDragSourceActionMask
 {
+    // Quick fix for <rdar://problem/3814810> REGRESSION (125-164): Exception adding nil to dictionary in dragging code:
+    if (_private->mouseDownEvent == nil) {
+        return WebDragSourceActionNone;
+    }
     WebView *webView = [self _webView];
     NSPoint point = [webView convertPoint:[_private->mouseDownEvent locationInWindow] fromView:nil];
     _private->dragSourceActionMask = [[webView _UIDelegateForwarder] webView:webView dragSourceActionMaskForPoint:point];
     WebView *webView = [self _webView];
     NSPoint point = [webView convertPoint:[_private->mouseDownEvent locationInWindow] fromView:nil];
     _private->dragSourceActionMask = [[webView _UIDelegateForwarder] webView:webView dragSourceActionMaskForPoint:point];