[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:39:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 603f6c096442625ee613cadcee3b48a6ccd905c3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 29 21:54:31 2003 +0000
Tests:
Updated to use the new NSURLDownload API.
* Downloader/MyDocument.h:
* Downloader/MyDocument.m:
(-[MyDocument downloadCancel:]):
(-[MyDocument savePanelDidEnd:returnCode:contextInfo:]):
(-[MyDocument downloadDidBegin:]):
(-[MyDocument download:didReceiveResponse:]):
(-[MyDocument download:decideDestinationWithSuggestedFilename:]):
(-[MyDocument download:didReceiveDataOfLength:]):
(-[MyDocument download:didCreateDestination:]):
(-[MyDocument downloadDidFinish:]):
(-[MyDocument download:didFailWithError:]):
WebFoundation:
Updated to new NSURLDownload API.
Reviewed by rjw.
* FileTransfer.subproj/NSBinHexDecoder.m:
(+[NSBinHexDecoder MIMEType]):
* FileTransfer.subproj/NSGZipDecoder.m:
(+[NSGZipDecoder MIMEType]):
* FileTransfer.subproj/NSMacBinaryDecoder.m:
(+[NSMacBinaryDecoder MIMEType]):
* FileTransfer.subproj/NSURLDownload.h:
* FileTransfer.subproj/NSURLDownload.m:
(-[NSURLDownload initWithSource:delegate:]):
(-[NSURLDownload _initWithLoadingResource:request:response:delegate:proxy:]):
(+[NSURLDownload _downloadWithLoadingConnection:request:response:delegate:proxy:]):
(+[NSURLDownload _downloadWithSource:delegate:directory:]):
(-[NSURLDownload setDestination:allowOverwrite:]):
(-[NSURLDownload source]):
(-[NSURLDownload useCredential:forAuthenticationChallenge:]):
(-[NSURLDownload continueWithoutCredentialForAuthenticationChallenge:]):
(-[NSURLDownload _sendDidBeginMessage]):
(-[NSURLDownload connection:willSendRequest:redirectResponse:]):
(-[NSURLDownload connection:didReceiveResponse:]):
(-[NSURLDownload connection:didReceiveData:]):
(-[NSURLDownload connectionDidFinishLoading:]):
(-[NSURLDownload connection:didFailLoadingWithError:]):
(-[NSURLDownload _createFileIfNecessary]):
(-[NSURLDownload _decodeHeaderData:dataForkData:resourceForkData:]):
(-[NSURLDownload _decodeData:dataForkData:resourceForkData:]):
(-[NSURLDownload _didCloseFile:]):
(-[NSURLDownload _cancelWithError:]):
(-[NSURLDownload _setPath:]):
(-[NSURLConnectionDelegateProxy connection:didFailLoadingWithError:]):
* FileTransfer.subproj/NSURLDownloadDecoder.h:
* FileTransfer.subproj/NSURLDownloadPrivate.h:
* FileTransfer.subproj/NSURLUpload.h: Added.
* FileTransfer.subproj/NSURLUpload.m: Added.
(-[NSURLUpload initWithSource:destination:delegate:]):
(-[NSURLUpload useCredential:forAuthenticationChallenge:]):
(-[NSURLUpload continueWithoutCredentialForAuthenticationChallenge:]):
(-[NSURLUploadAuthenticationChallenge upload]):
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Updated to use the new NSURLDownload API.
Reviewed by rjw.
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSourcePrivate dealloc]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
* WebView.subproj/WebViewPrivate.m:
(-[WebView _downloadURL:toDirectory:]):
WebBrowser:
Updated to use the new NSURLDownload API.
Reviewed by rjw.
* DownloadMonitor.m:
(-[DownloadMonitor downloadDidBegin:]):
(-[DownloadMonitor download:decideDestinationWithSuggestedFilename:]):
(-[DownloadMonitor download:shouldDecodeSourceDataOfMIMEType:]):
(-[DownloadMonitor download:didCreateDestination:]):
(-[DownloadMonitor downloadDidFinish:]):
(-[DownloadMonitor download:didFailWithError:]):
(-[DownloadMonitor cancelDownload:withError:]):
* DownloadProgressEntry.m:
(-[DownloadProgressEntry reload]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4211 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4102de2..ab10ad7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-29 Chris Blumenberg <cblu at apple.com>
+
+ Updated to use the new NSURLDownload API.
+
+ Reviewed by rjw.
+
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _downloadURL:toDirectory:]):
+
2003-04-29 Richard Williamson <rjw at apple.com>
Added "Copyright (C) 2003 Apple Computer, Inc. All rights reserved."
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 5e114a6..9da3548 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -98,10 +98,6 @@
// WebResourceLoadDelegate messages if the item is loaded from the
// page cache.
NSMutableArray *responses;
-
- BOOL isDownloading;
- NSString *downloadPath;
- NSString *downloadDirectory;
BOOL justOpenedForTargetedLink;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5c3555d..93509ff 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -66,8 +66,6 @@
[ourBackForwardItems release];
[triggeringAction release];
[lastCheckedRequest release];
- [downloadPath release];
- [downloadDirectory release];
[responses release];
[webFrame release];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 1b729b0..da81a97 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -170,11 +170,11 @@
case WebPolicyDownload:
[proxy setDelegate:nil];
- [NSURLDownload _downloadWithLoadingResource:connection
- request:request
- response:r
- delegate:[self downloadDelegate]
- proxy:proxy];
+ [NSURLDownload _downloadWithLoadingConnection:connection
+ request:request
+ response:r
+ delegate:[self downloadDelegate]
+ proxy:proxy];
[proxy release];
proxy = nil;
[self receivedError:[self interruptForPolicyChangeError]];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 1b729b0..da81a97 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -170,11 +170,11 @@
case WebPolicyDownload:
[proxy setDelegate:nil];
- [NSURLDownload _downloadWithLoadingResource:connection
- request:request
- response:r
- delegate:[self downloadDelegate]
- proxy:proxy];
+ [NSURLDownload _downloadWithLoadingConnection:connection
+ request:request
+ response:r
+ delegate:[self downloadDelegate]
+ proxy:proxy];
[proxy release];
proxy = nil;
[self receivedError:[self interruptForPolicyChangeError]];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 304d92a..88610f5 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -227,18 +227,12 @@
- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directory
{
ASSERT(URL);
-
+
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
- NSURLDownload *download = [[NSURLDownload alloc] initWithRequest:request];
+ [NSURLDownload _downloadWithSource:request
+ delegate:_private->downloadDelegate
+ directory:[directory isAbsolutePath] ? directory : nil];
[request release];
-
- if (directory != nil && [directory isAbsolutePath]) {
- [download _setDirectoryPath:directory];
- }
-
- // The download retains itself in loadWithDelegate.
- [download loadWithDelegate:_private->downloadDelegate];
- [download release];
}
- (BOOL)defersCallbacks
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list