[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:44:02 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit a3dcb6f9d7b5a22eab446d8cba50fe8fb2e8d8ae
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 4 02:45:02 2003 +0000

    WebKit:
    
            Fixed: 3278496 - <rdar://problem/3278496>:	NSURLDownload: initWithSource and source should be renamed to initWithRequest and request
    
            Reviewed by rjw.
    
            * Misc.subproj/WebDownload.m:
            (-[WebDownload initWithRequest:delegate:]):
            (-[WebDownload _initWithRequest:delegate:directory:]):
            * WebView.subproj/WebImageView.m:
            (-[WebImageView setNeedsDisplay:]):
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _downloadURL:toDirectory:]):
    
    WebBrowser:
    
            Fixed: 3278496 - <rdar://problem/3278496>:	NSURLDownload: initWithSource and source should be renamed to initWithRequest and request
    
            Reviewed by rjw.
    
            * DownloadMonitor.m:
            (-[DownloadMonitor downloadDidBegin:]):
            (-[DownloadMonitor startDownloadForRequest:mayOpenWhenDone:]):
            * DownloadProgressEntry.h:
            * DownloadProgressEntry.m:
            (-[DownloadProgressEntry reload]):
    
    WebKitExamples:
    
            Fixed: 3278496 - <rdar://problem/3278496>:	NSURLDownload: initWithSource and source should be renamed to initWithRequest and request
    
            Reviewed by rjw.
    
            * CarbonDownloader/CarbonURLDownload.mm:
            (CarbonURLDownload::CarbonURLDownload):
            * Downloader/MyDocument.m:
            (-[MyDocument downloadOrCancel:]):
            (-[MyDocument savePanelDidEnd:returnCode:contextInfo:]):
            (-[MyDocument download:didFailWithError:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cef33cc..f2a1fad 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-06-03  Chris Blumenberg  <cblu at apple.com>
+
+        Fixed: 3278496 - <rdar://problem/3278496>:	NSURLDownload: initWithSource and source should be renamed to initWithRequest and request
+
+        Reviewed by rjw.
+
+        * Misc.subproj/WebDownload.m:
+        (-[WebDownload initWithRequest:delegate:]):
+        (-[WebDownload _initWithRequest:delegate:directory:]):
+        * WebView.subproj/WebImageView.m:
+        (-[WebImageView setNeedsDisplay:]):
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _downloadURL:toDirectory:]):
+
 2003-06-03  Richard Williamson   <rjw at apple.com>
 	
 	Fixed 3263188, 3274636.
diff --git a/WebKit/Misc.subproj/WebDownload.m b/WebKit/Misc.subproj/WebDownload.m
index 58103d2..a269bdb 100644
--- a/WebKit/Misc.subproj/WebDownload.m
+++ b/WebKit/Misc.subproj/WebDownload.m
@@ -156,11 +156,11 @@
     return self;
 }
 
-- (id)initWithSource:(NSURLRequest *)request delegate:(id)delegate
+- (id)initWithRequest:(NSURLRequest *)request delegate:(id)delegate
 {
     self = [self init];
     [_webInternal setRealDelegate:delegate];
-    [super initWithSource:request delegate:_webInternal];
+    [super initWithRequest:request delegate:_webInternal];
     return self;
 }
 
@@ -176,13 +176,13 @@
     return self;
 }
 
-- (id)_initWithSource:(NSURLRequest *)request
-             delegate:(id)delegate
-            directory:(NSString *)directory
+- (id)_initWithRequest:(NSURLRequest *)request
+              delegate:(id)delegate
+             directory:(NSString *)directory
 {
     self = [self init];
     [_webInternal setRealDelegate:delegate];
-    [super _initWithSource:request delegate:_webInternal directory:directory];
+    [super _initWithRequest:request delegate:_webInternal directory:directory];
     return self;
 }
 
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 9948439..8f020f5 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -237,9 +237,9 @@ static NSMutableSet *schemesWithRepresentationsSet;
     ASSERT(URL);
     
     NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
-    [WebDownload _downloadWithSource:request
-                            delegate:_private->downloadDelegate
-                           directory:[directory isAbsolutePath] ? directory : nil];
+    [WebDownload _downloadWithRequest:request
+                             delegate:_private->downloadDelegate
+                            directory:[directory isAbsolutePath] ? directory : nil];
     [request release];
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list