[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 b32d1fc7db6210982df692220f0364b55d2af4c3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 12 00:45:46 2002 +0000

            2986548 - Crash if you drop URL of frameset page onto frame
            2953421 - document dragged into frame should replace frameset
    
            * WebView.subproj/IFWebView.mm:
            (-[IFWebView draggingEntered:]): removed obsolute comment
            (-[IFWebView performDragOperation:]): moved implementation from here
            (-[IFWebView concludeDragOperation:]): to here, added support for NSURL drags
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1542 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 31a3135..1bf3af0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-11  Chris Blumenberg  <cblu at apple.com>
+
+Fix for:
+        2986548 - Crash if you drop URL of frameset page onto frame
+        2953421 - document dragged into frame should replace frameset
+        
+        * WebView.subproj/IFWebView.mm: 
+        (-[IFWebView draggingEntered:]): removed obsolute comment
+        (-[IFWebView performDragOperation:]): moved implementation from here
+        (-[IFWebView concludeDragOperation:]): to here, added support for NSURL drags 
+
 2002-07-11  Darin Adler  <darin at apple.com>
 
         * WebView.subproj/IFWebViewPrivate.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 31a3135..1bf3af0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-11  Chris Blumenberg  <cblu at apple.com>
+
+Fix for:
+        2986548 - Crash if you drop URL of frameset page onto frame
+        2953421 - document dragged into frame should replace frameset
+        
+        * WebView.subproj/IFWebView.mm: 
+        (-[IFWebView draggingEntered:]): removed obsolute comment
+        (-[IFWebView performDragOperation:]): moved implementation from here
+        (-[IFWebView concludeDragOperation:]): to here, added support for NSURL drags 
+
 2002-07-11  Darin Adler  <darin at apple.com>
 
         * WebView.subproj/IFWebViewPrivate.mm:
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index e4a28fd..077e00a 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -124,7 +124,6 @@
             return NSDragOperationCopy;
             
     }else if([dragType isEqualToString:@"NSURLPboardType"]){
-        //use URLFromPasteboard:
         return NSDragOperationCopy;
     }else if([dragType isEqualToString:@"NSStringPboardType"]){
         URLString = [[sender draggingPasteboard] stringForType:@"NSStringPboardType"];
@@ -141,37 +140,39 @@
 
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
+    return YES;
+}
+
+- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
+{
     IFWebDataSource *dataSource;
     IFWebFrame *frame;
     NSArray *files;
     NSString *file, *dragType;
     NSURL *URL=nil;
-    
+
     dragType = [[sender draggingPasteboard] availableTypeFromArray:_private->draggingTypes];
     if([dragType isEqualToString:@"NSFilenamesPboardType"]){
         files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
         file = [files objectAtIndex:0];
         URL = [NSURL fileURLWithPath:file];
     }else if([dragType isEqualToString:@"NSURLPboardType"]){
-        // FIXME: Is this the right way to get the URL? How to test?
-        URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSURLPboardType"]];
+        URL = [NSURL URLFromPasteboard:[sender draggingPasteboard]];
     }else if([dragType isEqualToString:@"NSStringPboardType"]){
         URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
     }
+
+    if(!URL){
+        return;
+    }
     
-    if(!URL)
-        return NO;
-        
     dataSource = [[[IFWebDataSource alloc] initWithURL:URL] autorelease];
     frame = nil;
     frame = [[self controller] mainFrame];
     if([frame setProvisionalDataSource:dataSource])
         [frame startLoading];
-    
-    return YES;
 }
 
-
 + (void) registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType
 {
     NSMutableDictionary *viewTypes = [[self class] _viewTypes];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index e4a28fd..077e00a 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -124,7 +124,6 @@
             return NSDragOperationCopy;
             
     }else if([dragType isEqualToString:@"NSURLPboardType"]){
-        //use URLFromPasteboard:
         return NSDragOperationCopy;
     }else if([dragType isEqualToString:@"NSStringPboardType"]){
         URLString = [[sender draggingPasteboard] stringForType:@"NSStringPboardType"];
@@ -141,37 +140,39 @@
 
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
+    return YES;
+}
+
+- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
+{
     IFWebDataSource *dataSource;
     IFWebFrame *frame;
     NSArray *files;
     NSString *file, *dragType;
     NSURL *URL=nil;
-    
+
     dragType = [[sender draggingPasteboard] availableTypeFromArray:_private->draggingTypes];
     if([dragType isEqualToString:@"NSFilenamesPboardType"]){
         files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
         file = [files objectAtIndex:0];
         URL = [NSURL fileURLWithPath:file];
     }else if([dragType isEqualToString:@"NSURLPboardType"]){
-        // FIXME: Is this the right way to get the URL? How to test?
-        URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSURLPboardType"]];
+        URL = [NSURL URLFromPasteboard:[sender draggingPasteboard]];
     }else if([dragType isEqualToString:@"NSStringPboardType"]){
         URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
     }
+
+    if(!URL){
+        return;
+    }
     
-    if(!URL)
-        return NO;
-        
     dataSource = [[[IFWebDataSource alloc] initWithURL:URL] autorelease];
     frame = nil;
     frame = [[self controller] mainFrame];
     if([frame setProvisionalDataSource:dataSource])
         [frame startLoading];
-    
-    return YES;
 }
 
-
 + (void) registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType
 {
     NSMutableDictionary *viewTypes = [[self class] _viewTypes];

-- 
WebKit Debian packaging