[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 27d997617f85fe9f7aaff9ff47cd70a4b23987ea
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 14 17:58:11 2004 +0000

    	Fixed:
    	<rdar://problem/3692668> REGRESSION: delay when images and links
    	<rdar://problem/3692675> links should drag when dragging images that are links when drag source action is WebDragSourceActionLink
    
            Reviewed by trey.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _mayStartDragWithMouseDragged:]): cleaned up, only use selection delay for selections, allow links to be dragged when image dragging is disabled
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6824 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5cd2f35..20542ca 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-14  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed:
+	<rdar://problem/3692668> REGRESSION: delay when images and links
+	<rdar://problem/3692675> links should drag when dragging images that are links when drag source action is WebDragSourceActionLink
+
+        Reviewed by trey.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _mayStartDragWithMouseDragged:]): cleaned up, only use selection delay for selections, allow links to be dragged when image dragging is disabled 
+
 2004-06-12  Trey Matteson  <trey at apple.com>
 
 	Small rearrangement to support dynamic changing of the drag
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 7bb56f9..03e89bd 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -917,15 +917,23 @@ static WebHTMLView *lastHitView = nil;
     NSPoint mouseDownPoint = [self convertPoint:[_private->mouseDownEvent locationInWindow] fromView:nil];
     NSDictionary *mouseDownElement = [self elementAtPoint:mouseDownPoint];
 
-    NSURL *imageURL = [mouseDownElement objectForKey: WebElementImageURLKey];
-
-    if (((imageURL && [[WebPreferences standardPreferences] loadsImagesAutomatically] && (_private->dragSourceActionMask & WebDragSourceActionImage)) ||
-         (!imageURL && [mouseDownElement objectForKey: WebElementLinkURLKey] && (_private->dragSourceActionMask & WebDragSourceActionLink)) ||
-         ([[mouseDownElement objectForKey:WebElementIsSelectedKey] boolValue] && (_private->dragSourceActionMask & WebDragSourceActionSelection))) &&
-        (([mouseDraggedEvent timestamp] - [_private->mouseDownEvent timestamp]) > TextDragDelay)) {
+    if ([mouseDownElement objectForKey: WebElementImageURLKey] != nil && 
+        [[WebPreferences standardPreferences] loadsImagesAutomatically] && 
+        (_private->dragSourceActionMask & WebDragSourceActionImage)) {
         return YES;
     }
-
+    
+    if ([mouseDownElement objectForKey:WebElementLinkURLKey] != nil && 
+        (_private->dragSourceActionMask & WebDragSourceActionLink)) {
+        return YES;
+    }
+    
+    if ([[mouseDownElement objectForKey:WebElementIsSelectedKey] boolValue] &&
+        (([mouseDraggedEvent timestamp] - [_private->mouseDownEvent timestamp]) > TextDragDelay) &&
+        (_private->dragSourceActionMask & WebDragSourceActionSelection)) {
+        return YES;
+    }
+    
     return NO;
 }
 

-- 
WebKit Debian packaging