Changeset 25585 in webkit

Timestamp:

Sep 15, 2007 1:45:29 PM (17 years ago)

Author:

darin

Message:

Reviewed by John Sullivan.

• fix <rdar://problem/5391540> REGRESSION: Can't drag images from Safari to applications in the dock (Tiger Preview, others in Leopard)

• Misc/WebNSPasteboardExtras.mm: (-[NSPasteboard _web_declareAndWriteDragImageForElement:URL:title:archive:source:]): Re-implement code here that has been missing for the last couple of years since we did some image refactoring. Was pretty easy now that we can freely call C++ code in WebKit.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebNSPasteboardExtras.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-09-15  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        - fix <rdar://problem/5391540> REGRESSION: Can't drag images from Safari to applications
+          in the dock (Tiger Preview, others in Leopard)
+
+        * Misc/WebNSPasteboardExtras.mm:
+        (-[NSPasteboard _web_declareAndWriteDragImageForElement:URL:title:archive:source:]):
+        Re-implement code here that has been missing for the last couple of years since we
+        did some image refactoring. Was pretty easy now that we can freely call C++ code
+        in WebKit.
+
 2007-09-14  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/Misc/WebNSPasteboardExtras.mm

@@ -260 +260 @@
 {
     ASSERT(self == [NSPasteboard pasteboardWithName:NSDragPboard]);
+
     NSMutableArray *types = [[NSMutableArray alloc] initWithObjects:NSFilesPromisePboardType, nil];
     [types addObjectsFromArray:[NSPasteboard _web_writableTypesForImageIncludingArchive:(archive != nil)]];
@@ -266 +267 @@
     [types release];
 
-    // FIXME: This has been broken for a while.
-    // There's no way to get the MIME type for the image from a DOM element.
-    // The old code used WKGetPreferredExtensionForMIMEType([image MIMEType]);
     NSString *extension = @"";
-    NSArray *extensions = [NSArray arrayWithObject:extension];
-
+    if (RenderObject* renderer = core(element)->renderer())
+        if (renderer->isImage())
+            if (CachedImage* image = static_cast<RenderImage*>(renderer)->cachedImage())
+                extension = WKGetPreferredExtensionForMIMEType(image->response().mimeType());
+
+    NSArray *extensions = [[NSArray alloc] initWithObjects:extension, nil];
     [self setPropertyList:extensions forType:NSFilesPromisePboardType];
+    [extensions release];
+
     return source;
 }