[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 f20f750f45ce1f5b928b3780c650fdc38aa55145
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 21:27:21 2004 +0000

    	Fixed: <rdar://problem/3560132>: REGRESSION: Safari crashed in -[NSPasteboard setData:forType:] dragging a map out of Mapquest.com
    
            Reviewed by john.
    
            * Misc.subproj/WebNSPasteboardExtras.m:
            (-[NSPasteboard _web_writeImage:URL:title:fileWrapper:HTMLString:]): declare the pboard types by calling _web_writeURL:::: before calling setData::
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6177 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e1fa7f1..9a9cb02 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-05  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3560132>: REGRESSION: Safari crashed in -[NSPasteboard setData:forType:] dragging a map out of Mapquest.com
+
+        Reviewed by john.
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_writeImage:URL:title:fileWrapper:HTMLString:]): declare the pboard types by calling _web_writeURL:::: before calling setData::
+
 2004-03-05  John Sullivan  <sullivan at apple.com>
 
         First cut at WebKit support for showing error pages for unreachable URLs.
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 2a4cc7b..b683948 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -171,8 +171,8 @@ NSString *WebURLNamePboardType = nil;
         [types addObject:NSFilesPromisePboardType];
     }
 
-    [self setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
     [self _web_writeURL:URL andTitle:title withOwner:self types:types];
+    [self setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
     
     if (fileWrapper) {
         [self _web_writeFileWrapperAsRTFDAttachment:fileWrapper];

-- 
WebKit Debian packaging