[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[trey]

The following commit has been merged in the debian/unstable branch:
commit 7e1e1acfec14335922ec90db7e3742e4f3a65aeb
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 7 17:56:19 2004 +0000

    	WebKit no longer causes an endless stream of dragexit events to
    	occur at the DHTML level when hovering over an element that is
    	not accepting the drag.
    
            Reviewed by Chris
    
            * WebView.subproj/WebView.m:
            (-[WebView _dragOperationForDraggingInfo:]):  If the potential target refuses
    	the item, don't turn around and immediately tell it to cancel the drag, which is
    	what leads to the exit event happening at the DOM level.  If the target just
    	refused the drag, it should not have anything it needs to cancel.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 45db53d..f85e311 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2004-06-05  Trey Matteson  <trey at apple.com>
+
+	WebKit no longer causes an endless stream of dragexit events to
+	occur at the DHTML level when hovering over an element that is
+	not accepting the drag.
+
+        Reviewed by Chris
+
+        * WebView.subproj/WebView.m:
+        (-[WebView _dragOperationForDraggingInfo:]):  If the potential target refuses
+	the item, don't turn around and immediately tell it to cancel the drag, which is
+	what leads to the exit event happening at the DOM level.  If the target just
+	refused the drag, it should not have anything it needs to cancel.
+
 2004-06-03  Trey Matteson  <trey at apple.com>
 
 	DHTML dragging uses the Cocoa NSDragOperation on both the source and dest ends.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 72bf367..3ef094d 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -1732,18 +1732,15 @@ NS_ENDHANDLER
         operation = [_private->draggingDocumentView draggingUpdatedWithDraggingInfo:draggingInfo];
         if (operation == NSDragOperationNone) {
             NSView *view = [self hitTest:[[self superview] convertPoint:windowPoint toView:nil]];
-            if ([view isKindOfClass:[WebBaseNetscapePluginView class]]) {
-                // Don't accept the drag over a plug-in since plug-ins may want to handle it.
-                operation = NSDragOperationNone;
-            } else if (!_private->editable && !_private->initiatedDrag) {
+            // Don't accept the drag over a plug-in since plug-ins may want to handle it.
+            if (![view isKindOfClass:[WebBaseNetscapePluginView class]]
+                && !_private->editable && !_private->initiatedDrag)
+            {
                 // If not editing or dragging, use _web_dragOperationForDraggingInfo to find a URL to load on the pasteboard.
                 operation = [self _web_dragOperationForDraggingInfo:draggingInfo];
             }
         }
-    }
-    
-    if (operation == NSDragOperationNone) {
-        // ??? this is bad, it is causing false exit events in WebCore
+    } else {
         [_private->draggingDocumentView draggingCancelledWithDraggingInfo:draggingInfo];
     }
     

-- 
WebKit Debian packaging