[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 6b7c771b2de7493b136a004ec114a3eb7678b955
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 9 00:55:15 2004 +0000

    	In DHTML dragging there is no notion of registering for types, so we'd
    	like to just pass all types down to WebCore.  It turns out that the per-type
    	registration doesn't matter as far as the underlying drag service is
    	concerned, so Cocoa is already getting called for any type.  We just hack and
    	override a private method to ensure we accept any type.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebView.m:
            (-[WebView _hitTest:dragTypes:]):  We accept any drag type if it is within
    	our view, without overriding a subview's decision.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0217865..1a39480 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
 2004-06-08  Trey Matteson  <trey at apple.com>
 
+	In DHTML dragging there is no notion of registering for types, so we'd
+	like to just pass all types down to WebCore.  It turns out that the per-type
+	registration doesn't matter as far as the underlying drag service is
+	concerned, so Cocoa is already getting called for any type.  We just hack and
+	override a private method to ensure we accept any type.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView _hitTest:dragTypes:]):  We accept any drag type if it is within
+	our view, without overriding a subview's decision.
+
+2004-06-08  Trey Matteson  <trey at apple.com>
+
 	A DHTML drag source can now change the dragging image during the drag.  Currently
 	it may only be set to a static image.
 
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 3ef094d..f83c772 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -72,6 +72,10 @@
 - (void)_preflightChosenSpellServer;
 @end
 
+ at interface NSView (AppKitSecretsIKnow)
+- (NSView *)_hitTest:(NSPoint *)aPoint dragTypes:(NSSet *)types;
+ at end
+
 @interface WebView (WebFileInternal)
 - (void)_preflightSpellChecker;
 - (BOOL)_continuousCheckingAllowed;
@@ -1799,6 +1803,16 @@ NS_ENDHANDLER
     }
 }
 
+- (NSView *)_hitTest:(NSPoint *)aPoint dragTypes:(NSSet *)types
+{
+    NSView *hitView = [super _hitTest:aPoint dragTypes:types];
+    if (!hitView && [[self superview] mouse:*aPoint inRect:[self frame]]) {
+        return self;
+    } else {
+        return hitView;
+    }
+}
+
 - (BOOL)acceptsFirstResponder
 {
     return [[[self mainFrame] frameView] acceptsFirstResponder];

-- 
WebKit Debian packaging