Reviewed by Eric and Tim H.

        Bug 10634: -webView:dragDestinationActionMaskForDraggingInfo: is ignored
        http://bugzilla.opendarwin.org/show_bug.cgi?id=10634

        Remove the check for canShowFile: from _web_bestURL: since
        it shouldn't be concerned with whether or not the view
        can show the URL, merely return the most appropriate URL.

        * Misc/WebNSPasteboardExtras.m:
        (-[NSPasteboard _web_bestURL]):
        * Misc/WebNSViewExtras.m:
        (-[NSView _web_dragOperationForDraggingInfo:]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f7b275116b6c55efcd4fba57a85d24132f3f2d02..7d7986f4325c7e82b1f3e4435bdceaa1d601fe22 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2006-08-30  Karl Adam  <karladam@yahoo-inc.com>
+
+        Reviewed by Eric and Tim H.
+
+        Bug 10634: -webView:dragDestinationActionMaskForDraggingInfo: is ignored
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10634
+        
+        Remove the check for canShowFile: from _web_bestURL: since
+        it shouldn't be concerned with whether or not the view
+        can show the URL, merely return the most appropriate URL.
+
+        * Misc/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_bestURL]):
+        * Misc/WebNSViewExtras.m:
+        (-[NSView _web_dragOperationForDraggingInfo:]):
+
 2006-08-29  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Kevin Decker (Sarge)

diff --git a/WebKit/Misc/WebNSPasteboardExtras.m b/WebKit/Misc/WebNSPasteboardExtras.m
index 7f05f06eb778fd0045590c3e29cccfd3ec4c7533..b22deba694bbea0568ebf9ca9cd2da8995bc827b 100644 (file)
--- a/WebKit/Misc/WebNSPasteboardExtras.m
+++ b/WebKit/Misc/WebNSPasteboardExtras.m
@@ -162,9 +162,7 @@ static NSArray *_writableTypesForImageWithArchive (void)
             NSString *file = [files objectAtIndex:0];
             BOOL isDirectory;
             if([[NSFileManager defaultManager] fileExistsAtPath:file isDirectory:&isDirectory] && !isDirectory){
-                if ([WebView canShowFile:file]) {
-                    return [[NSURL fileURLWithPath:file] _webkit_canonicalize];
-                }
+                return [[NSURL fileURLWithPath:file] _webkit_canonicalize];
             }
         }
     }

diff --git a/WebKit/Misc/WebNSViewExtras.m b/WebKit/Misc/WebNSViewExtras.m
index 643545470a0a78f1387246f9d9401157de825130..afdf94b707ef3368e8c5b3489996c1ba2eaf3e60 100644 (file)
--- a/WebKit/Misc/WebNSViewExtras.m
+++ b/WebKit/Misc/WebNSViewExtras.m
@@ -154,10 +154,11 @@
         ![[self window] attachedSheet] &&
         [sender draggingSource] != self &&
         [[sender draggingPasteboard] _web_bestURL]) {
+
         return NSDragOperationCopy;
-    } else {
-        return NSDragOperationNone;
     }
+    
+    return NSDragOperationNone;
 }
 
 - (void)_web_DragImageForElement:(DOMElement *)element