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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 5f6fd55fedc861593029bfa02706932c99f65247
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 5 21:59:05 2003 +0000

    	Fixed: <rdar://problem/3201364>: Safari crashes when hosting carbon plug-in using drag and drop
    
            Reviewed by rjw.
    
            * WebView.subproj/WebView.m:
            (-[WebView draggingUpdated:]): return NSDragOperationNone if we're over a plug-in view so the plug-in can handle the drag
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5393 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 544dc62..6eeb95b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-11-05  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3201364>: Safari crashes when hosting carbon plug-in using drag and drop
+
+        Reviewed by rjw.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView draggingUpdated:]): return NSDragOperationNone if we're over a plug-in view so the plug-in can handle the drag
+
+2003-11-05  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3474360>: should attempt to resolve symbolic links when choosing "Save Link As..."
 
         Reviewed by kocienda.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 98c8240..64cad60 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -7,6 +7,7 @@
 
 #import <WebKit/WebAssertions.h>
 #import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebBaseNetscapePluginView.h>
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebControllerSets.h>
 #import <WebKit/WebDataSourcePrivate.h>
@@ -1623,6 +1624,15 @@ NS_ENDHANDLER
     return [self _web_dragOperationForDraggingInfo:sender];
 }
 
+- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
+{
+    NSPoint point = [[self superview] convertPoint:[sender draggingLocation] toView:nil];
+    if ([[self hitTest:point] isKindOfClass:[WebBaseNetscapePluginView class]]) {
+        return NSDragOperationNone;
+    }
+    return [self _web_dragOperationForDraggingInfo:sender];
+}
+
 - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
 {
     return YES;

-- 
WebKit Debian packaging