[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:31:44 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6861dac04491e7076d5f28022bed998eccfefdd2
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 26 23:12:51 2003 +0000
Tests:
Reviewed by Darin
Changed WebResponse to NSURLResponse. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* Carbon/CarbonWeb/MyWebEventTypes.h:
* Carbon/CarbonWeb/MyWebResourceLoadAdapter.m:
(-[MyWebResourceLoadAdapter webView:resource:didReceiveResponse:fromDataSource:]):
* Carbon/CarbonWeb/TWebWindow.cp:
* Downloader/MyDocument.h:
* Downloader/MyDocument.m:
(-[MyDocument download:didReceiveResponse:]):
* PDFBundle/PDFView.m:
(-[PDFResourceDelegate resource:didReceiveResponse:]):
* SnippetEditor/DataResourceRequest.m:
(-[DataProtocolHandler startLoadingWithCacheObject:]):
WebFoundation:
Reviewed by Darin
Changed WebResponse to NSURLResponse. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* CacheLoader.subproj/WebCacheObject.h:
* CacheLoader.subproj/WebCacheObject.m:
(+[WebCacheObject cacheObjectWithResponse:]):
(-[WebCacheObject initWithCoder:]):
(-[WebCacheObject response]):
(-[WebCacheObject setResponse:]):
* CacheLoader.subproj/WebProtocol.h:
* CacheLoader.subproj/WebProtocol.m:
* CacheLoader.subproj/WebProtocolClient.h:
* CacheLoader.subproj/WebResource.h:
* CacheLoader.subproj/WebResource.m:
(-[WebResource _responseAvailable:]):
(-[WebResource _finishedLoading]):
(-[WebResource _failedWithError:]):
(-[WebResource response]):
(-[WebResourceInternal response]):
(-[WebResourceInternal responseAvailable:]):
* CacheLoader.subproj/WebResourceDelegate.h:
* CacheLoader.subproj/WebResourceQueue.m:
* CacheLoader.subproj/WebSynchronousDelegate.h:
* CacheLoader.subproj/WebSynchronousDelegate.m:
(-[WebSynchronousDelegate response]):
(-[WebSynchronousDelegate resource:didReceiveResponse:]):
* CacheLoader.subproj/WebSynchronousResult.h:
* CacheLoader.subproj/WebSynchronousResult.m:
(-[WebSynchronousResult response]):
(-[WebSynchronousResult _setResponse:]):
* CacheLoader.subproj/WebSynchronousResultPrivate.h:
* Misc.subproj/WebFoundation.h:
* ProtocolHandlers.subproj/WebAboutProtocol.m:
(-[WebAboutProtocol startLoadingWithCacheObject:]):
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
* ProtocolHandlers.subproj/WebFTPProtocol.m:
(-[WebFTPProtocol sendResponseAvailableCallback]):
* ProtocolHandlers.subproj/WebFileProtocol.m:
(-[WebFileProtocol didLoadData:]):
* ProtocolHandlers.subproj/WebHTTPProtocol.h:
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol initWithProtocolClient:request:]):
(-[WebHTTPProtocol canStoreCacheObject:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
* WebFoundation.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by Darin
Changed WebResponse to NSURLResponse. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* Downloads.subproj/WebDownload.h:
* Downloads.subproj/WebDownload.m:
(-[WebDownload _initWithLoadingResource:request:response:delegate:proxy:]):
(+[WebDownload _downloadWithLoadingResource:request:response:delegate:proxy:]):
(-[WebDownload _setResponse:]):
(-[WebDownload resource:didReceiveResponse:]):
* Downloads.subproj/WebDownloadPrivate.h:
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader resource:didReceiveResponse:]):
* Misc.subproj/WebKit.h:
* Plugins.subproj/WebBaseNetscapePluginStream.h:
* Plugins.subproj/WebBaseNetscapePluginStream.m:
(-[WebBaseNetscapePluginStream setResponse:]):
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream resource:didReceiveResponse:]):
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebSubresourceClient.h:
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient resource:didReceiveResponse:]):
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource response]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _setResponse:]):
(-[WebDataSource _commitIfReady:]):
(-[WebDataSource _addResponse:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _opened]):
* WebView.subproj/WebFrameViewPrivate.m:
* WebView.subproj/WebHTMLRepresentation.m:
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
(-[WebMainResourceClient continueAfterContentPolicy:]):
(-[WebMainResourceClient checkContentPolicyForResponse:]):
(-[WebMainResourceClient resource:didReceiveResponse:]):
(-[WebMainResourceClient startLoading:]):
(-[WebResourceDelegateProxy resource:didReceiveResponse:]):
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebTextRepresentation.m:
* WebView.subproj/WebTextView.m:
WebBrowser:
Reviewed by Darin
Changed WebResponse to NSURLResponse. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* BrowserDocument.m:
* BrowserWebController.m:
* BugReportController.m:
(-[BugReportController resource:didReceiveResponse:]):
* DownloadMonitor.m:
(-[DownloadMonitor download:didReceiveResponse:]):
* DownloadProgressEntry.h:
* DownloadProgressEntry.m:
(-[DownloadProgressEntry setResponse:]):
(-[DownloadProgressEntry response]):
* HTMLSourceDocument.m:
* LoadProgressMonitor.m:
(-[LoadProgressMonitor webView:resource:didReceiveResponse:fromDataSource:]):
* ResourceProgressEntry.m:
(-[ResourceProgressEntry statusString]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3927 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e60d5be..54303d4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,63 @@
+2003-03-26 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Darin
+
+ Changed WebResponse to NSURLResponse. Some other "supporting" names
+ changed as well. Note that there are no functional modifications,
+ only name changes.
+
+ * Downloads.subproj/WebDownload.h:
+ * Downloads.subproj/WebDownload.m:
+ (-[WebDownload _initWithLoadingResource:request:response:delegate:proxy:]):
+ (+[WebDownload _downloadWithLoadingResource:request:response:delegate:proxy:]):
+ (-[WebDownload _setResponse:]):
+ (-[WebDownload resource:didReceiveResponse:]):
+ * Downloads.subproj/WebDownloadPrivate.h:
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader resource:didReceiveResponse:]):
+ * Misc.subproj/WebKit.h:
+ * Plugins.subproj/WebBaseNetscapePluginStream.h:
+ * Plugins.subproj/WebBaseNetscapePluginStream.m:
+ (-[WebBaseNetscapePluginStream setResponse:]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream resource:didReceiveResponse:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient resource:didReceiveResponse:]):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource response]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setResponse:]):
+ (-[WebDataSource _commitIfReady:]):
+ (-[WebDataSource _addResponse:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _opened]):
+ * WebView.subproj/WebFrameViewPrivate.m:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ (-[WebMainResourceClient continueAfterContentPolicy:]):
+ (-[WebMainResourceClient checkContentPolicyForResponse:]):
+ (-[WebMainResourceClient resource:didReceiveResponse:]):
+ (-[WebMainResourceClient startLoading:]):
+ (-[WebResourceDelegateProxy resource:didReceiveResponse:]):
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebTextRepresentation.m:
+ * WebView.subproj/WebTextView.m:
+
2003-03-26 Darin Adler <darin at apple.com>
* English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
diff --git a/WebKit/Downloads.subproj/WebDownload.h b/WebKit/Downloads.subproj/WebDownload.h
index 20e1726..f0de420 100644
--- a/WebKit/Downloads.subproj/WebDownload.h
+++ b/WebKit/Downloads.subproj/WebDownload.h
@@ -10,7 +10,7 @@
@class WebDownloadPrivate;
@class WebError;
@class NSURLRequest;
- at class WebResponse;
+ at class NSURLResponse;
@protocol WebDownloadDecisionListener;
@@ -79,14 +79,14 @@
/*!
@method download:didReceiveResponse:
@abstract This method is called when the download has received a response from the server.
- @param download The download that now has a WebResponse available for inspection.
- @param response The WebResponse object for the given download.
+ @param download The download that now has a NSURLResponse available for inspection.
+ @param response The NSURLResponse object for the given download.
@discussion In some rare cases, multiple responses may be received for a single download.
This occurs with multipart/x-mixed-replace, or "server push". In this case, the client
should assume that each new response resets progress so far for the resource back to 0,
and should check the new response for the expected content length.
*/
-- (void)download:(WebDownload *)download didReceiveResponse:(WebResponse *)response;
+- (void)download:(WebDownload *)download didReceiveResponse:(NSURLResponse *)response;
/*!
@method download:decidePathWithListener:suggestedFilename:
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 88d9d28..2f55dbb 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -16,14 +16,14 @@
#import <WebKit/WebMacBinaryDecoder.h>
#import <WebKit/WebMainResourceClient.h>
#import <WebKit/WebNSWorkspaceExtras.h>
-#import <WebKit/WebResourceResponseExtras.h>
+#import <WebKit/WebNSURLResponseExtras.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
typedef struct WebFSForkIOParam
{
@@ -56,7 +56,7 @@ typedef struct WebFSRefParam
WebResource *resource;
NSURLRequest *request;
- WebResponse *response;
+ NSURLResponse *response;
WebResourceDelegateProxy *proxy;
id delegate;
@@ -78,7 +78,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
- (void)_downloadStarted;
- (void)_downloadEnded;
- (void)_setRequest:(NSURLRequest *)request;
-- (void)_setResponse:(WebResponse *)response;
+- (void)_setResponse:(NSURLResponse *)response;
#pragma mark CREATING
- (NSString *)_pathWithUniqueFilenameForPath:(NSString *)path;
- (BOOL)_createFSRefForPath:(NSString *)path;
@@ -178,7 +178,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
- _initWithLoadingResource:(WebResource *)resource
request:(NSURLRequest *)request
- response:(WebResponse *)response
+ response:(NSURLResponse *)response
delegate:(id)delegate
proxy:(WebResourceDelegateProxy *)proxy
{
@@ -229,7 +229,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
+ _downloadWithLoadingResource:(WebResource *)resource
request:(NSURLRequest *)request
- response:(WebResponse *)response
+ response:(NSURLResponse *)response
delegate:(id)delegate
proxy:(WebResourceDelegateProxy *)proxy
{
@@ -311,7 +311,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
-- (void)_setResponse:(WebResponse *)response
+- (void)_setResponse:(NSURLResponse *)response
{
if (_private->response != response) {
[_private->response release];
@@ -338,7 +338,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return request;
}
--(void)resource:(WebResource *)resource didReceiveResponse:(WebResponse *)response
+-(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)response
{
[self _setResponse:response];
diff --git a/WebKit/Downloads.subproj/WebDownloadPrivate.h b/WebKit/Downloads.subproj/WebDownloadPrivate.h
index 504f32b..e5c9893 100644
--- a/WebKit/Downloads.subproj/WebDownloadPrivate.h
+++ b/WebKit/Downloads.subproj/WebDownloadPrivate.h
@@ -9,13 +9,13 @@
@class NSURLRequest;
@class WebResource;
- at class WebResponse;
+ at class NSURLResponse;
@class WebResourceDelegateProxy;
@interface WebDownload (WebPrivate)
+ _downloadWithLoadingResource:(WebResource *)resource
request:(NSURLRequest *)request
- response:(WebResponse *)response
+ response:(NSURLResponse *)response
delegate:(id)delegate
proxy:(WebResourceDelegateProxy *)proxy;
- (void)_setDirectoryPath:(NSString *)directoryPath;
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index c3fd26d..6db6cf4 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -114,7 +114,7 @@
return request;
}
--(void)resource:(WebResource *)resource didReceiveResponse:(WebResponse *)theResponse
+-(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)theResponse
{
// no-op
}
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index 427df53..5a31520 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -21,7 +21,7 @@
#import <WebKit/WebPluginError.h>
#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebResourceResponseExtras.h>
+#import <WebKit/WebNSURLResponseExtras.h>
#import <WebKit/WebStandardPanels.h>
#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.h b/WebKit/Misc.subproj/WebNSURLResponseExtras.h
index a634da6..5ee06b5 100644
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLResponseExtras.h
@@ -1,13 +1,13 @@
/*
- WebResourceResponseExtras.h
+ WebNSURLResponseExtras.h
Copyright 2003, Apple, Inc. All rights reserved.
Public header file.
*/
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
- at interface WebResponse (WebResourceResponseExtras)
+ at interface NSURLResponse (WebNSURLResponseExtras)
/*!
@method suggestedFilenameForSaving
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.m b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
index ba6ec01..762b18e 100644
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
@@ -1,24 +1,24 @@
//
-// WebResourceResponseExtras.m
+// WebNSURLResponseExtras.m
// WebKit
//
// Created by Chris Blumenberg on Thu Jan 09 2003.
// Copyright (c) 2003 Apple Inc. All rights reserved.
//
-#import <WebKit/WebResourceResponseExtras.h>
+#import <WebKit/WebNSURLResponseExtras.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebHTTPResponse.h>
+#import <WebFoundation/NSHTTPURLResponse.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebNSStringExtras.h>
- at interface NSURL (WebResourceResponseInternalURLExtras)
+ at interface NSURL (WebNSURLResponseInternalURLExtras)
- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType;
@end
- at implementation WebResponse (WebResourceResponseExtras)
+ at implementation NSURLResponse (WebNSURLResponseExtras)
- (NSString *)suggestedFilenameForSaving
{
@@ -30,7 +30,7 @@
@end
- at implementation WebHTTPResponse (WebResourceResponseExtras)
+ at implementation NSHTTPURLResponse (WebNSURLResponseExtras)
- (NSString *)suggestedFilenameForSaving
{
@@ -51,7 +51,7 @@
@end
- at implementation NSURL (WebResourceResponseInternalURLExtras)
+ at implementation NSURL (WebNSURLResponseInternalURLExtras)
- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType
{
diff --git a/WebKit/Misc.subproj/WebResourceResponseExtras.h b/WebKit/Misc.subproj/WebResourceResponseExtras.h
deleted file mode 100644
index a634da6..0000000
--- a/WebKit/Misc.subproj/WebResourceResponseExtras.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- WebResourceResponseExtras.h
- Copyright 2003, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <WebFoundation/WebResponse.h>
-
- at interface WebResponse (WebResourceResponseExtras)
-
-/*!
- @method suggestedFilenameForSaving
- @abstract Returns a suggested filename if the resource were saved to disk.
- @discussion The method first checks if the server has specified a filename using the
- content disposition header. If no valid filename is specified using that mechanism,
- this method checks the last path component of the URL. If no valid filename can be
- obtained using the last path component, this method uses the URL's host as the filename.
- If the URL's host can't be converted to a valid filename, the filename "unknown" is used.
- In mose cases, this method appends the proper file extension based on the MIME type.
- This method always returns a valid filename.
- @result A suggested filename to use if saving the resource to disk.
-*/
-- (NSString *)suggestedFilenameForSaving;
-
- at end
diff --git a/WebKit/Misc.subproj/WebResourceResponseExtras.m b/WebKit/Misc.subproj/WebResourceResponseExtras.m
deleted file mode 100644
index ba6ec01..0000000
--- a/WebKit/Misc.subproj/WebResourceResponseExtras.m
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// WebResourceResponseExtras.m
-// WebKit
-//
-// Created by Chris Blumenberg on Thu Jan 09 2003.
-// Copyright (c) 2003 Apple Inc. All rights reserved.
-//
-
-#import <WebKit/WebResourceResponseExtras.h>
-
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebHTTPResponse.h>
-#import <WebFoundation/WebLocalizableStrings.h>
-#import <WebFoundation/WebNSStringExtras.h>
-
- at interface NSURL (WebResourceResponseInternalURLExtras)
-- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType;
- at end
-
- at implementation WebResponse (WebResourceResponseExtras)
-
-- (NSString *)suggestedFilenameForSaving
-{
- ASSERT([self URL]);
-
- // Get the filename from the URL and the MIME type. Always returns something valid.
- return [[self URL] _web_suggestedFilenameForSavingWithMIMEType:[self contentType]];
-}
-
- at end
-
- at implementation WebHTTPResponse (WebResourceResponseExtras)
-
-- (NSString *)suggestedFilenameForSaving
-{
- NSString *filename = nil;
-
- // Use the content disposition of the filename if present.
- NSString *contentDispositionHeader = [[self header] objectForKey:@"Content-Disposition"];
- filename = [contentDispositionHeader _web_fileNameFromContentDispositionHeader];
- filename = [filename _web_filenameByFixingIllegalCharacters];
-
- if ([filename length] == 0) {
- // Get the filename from the URL and the MIME type. Always returns something valid.
- filename = [super suggestedFilenameForSaving];
- }
-
- return filename;
-}
-
- at end
-
- at implementation NSURL (WebResourceResponseInternalURLExtras)
-
-- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType
-{
- // Get the filename from the URL. Try the lastPathComponent first.
- NSString *lastPathComponent = [[self path] lastPathComponent];
- NSString *filename = [lastPathComponent _web_filenameByFixingIllegalCharacters];
- NSString *extension = nil;
-
- if ([filename length] == 0 || [lastPathComponent isEqualToString:@"/"]) {
- // lastPathComponent is no good, try the host.
- filename = [[self host] _web_filenameByFixingIllegalCharacters];
- if ([filename length] == 0) {
- // Can't make a filename using this URL, use "unknown".
- filename = UI_STRING("unknown", "Unknown filename");
- }
- } else {
- // Save the extension for later correction. Only correct the extension of the lastPathComponent.
- // For example, if the filename ends up being the host, we wouldn't want to correct ".com" in "www.apple.com".
- extension = [filename pathExtension];
- }
-
- // If the type is known, check the extension and correct it if necessary.
- if (MIMEType && ![MIMEType isEqualToString:@"application/octet-stream"]) {
- WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
- NSArray *extensions = [mappings extensionsForMIMEType:MIMEType];
-
- if (![extension length] || (extensions && ![extensions containsObject:extension])) {
- // The extension doesn't match the MIME type. Correct this.
- NSString *correctExtension = [mappings preferredExtensionForMIMEType:MIMEType];
- if ([correctExtension length] != 0) {
- if ([extension length] != 0) {
- // Remove the incorrect extension.
- filename = [filename stringByDeletingPathExtension];
- }
-
- // Append the correct extension.
- filename = [filename stringByAppendingPathExtension:correctExtension];
- }
- }
- }
-
- return filename;
-}
-
- at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
index 4fd8e55..76d4103 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
@@ -9,7 +9,7 @@
#import <WebKit/npapi.h>
@class WebNetscapePluginPackage;
- at class WebResponse;
+ at class NSURLResponse;
@interface WebBaseNetscapePluginStream : WebBaseResourceHandleDelegate
{
@@ -31,7 +31,7 @@
}
- (void)setPluginPointer:(NPP)pluginPointer;
-- (void)setResponse:(WebResponse *)theReponse;
+- (void)setResponse:(NSURLResponse *)theReponse;
- (void)receivedData:(NSData *)data;
- (void)receivedError:(NPReason)reason;
- (void)finishedLoadingWithData:(NSData *)data;
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index 761b233..ecbc63e 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -8,7 +8,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
@implementation WebBaseNetscapePluginStream
@@ -46,7 +46,7 @@
NPP_URLNotify = [plugin NPP_URLNotify];
}
-- (void)setResponse:(WebResponse *)r
+- (void)setResponse:(NSURLResponse *)r
{
if(![plugin isLoaded]){
return;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index 5de0b09..55e9fa3 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -18,7 +18,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
@implementation WebNetscapePluginDocumentView
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 836b35b..8b3dbd2 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -74,7 +74,7 @@
}
}
-- (void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)theResponse
+- (void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)theResponse
{
[self setResponse:theResponse];
[super resource:h didReceiveResponse:theResponse];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6b1a15c..c528d3f 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -49,7 +49,7 @@
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebSystemBits.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebLocalizableStrings.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
index 5c1560b..e4cb20e 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
@@ -7,7 +7,7 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
@class WebDataSource;
- at class WebResponse;
+ at class NSURLResponse;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 848c8b0..7606ba5 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -16,7 +16,7 @@
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -91,7 +91,7 @@
return [super resource: h willSendRequest: newRequest];
}
--(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(r);
[loader receivedResponse:r];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
index 5c1560b..e4cb20e 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
@@ -7,7 +7,7 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
@class WebDataSource;
- at class WebResponse;
+ at class NSURLResponse;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 848c8b0..7606ba5 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -16,7 +16,7 @@
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -91,7 +91,7 @@
return [super resource: h willSendRequest: newRequest];
}
--(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(r);
[loader receivedResponse:r];
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 1f80b6e..04a1e0c 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -511,14 +511,14 @@
8398847B03426FB000BC5F5E,
ED2B2474033A2DA800C1A526,
ED2B2475033A2DA800C1A526,
+ 84A992C203CE696800CA2ACA,
+ 84A992C303CE696800CA2ACA,
F508946902B71D59018A9CD4,
F508946A02B71D59018A9CD4,
9345DDAE0365FB27008635CE,
9345DDAF0365FB27008635CE,
832B2D1403B10990009CF105,
832B2D1503B10990009CF105,
- 84A992C203CE696800CA2ACA,
- 84A992C303CE696800CA2ACA,
F560BEBC030DAF4401C1A526,
F560BEBD030DAF4401C1A526,
F59668C802AD2923018635CA,
@@ -2073,13 +2073,13 @@
84A992C203CE696800CA2ACA = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebResourceResponseExtras.h;
+ path = WebNSURLResponseExtras.h;
refType = 4;
};
84A992C303CE696800CA2ACA = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebResourceResponseExtras.m;
+ path = WebNSURLResponseExtras.m;
refType = 4;
};
84A992C403CE696800CA2ACA = {
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index a0a4ef0..e1e7526 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -10,7 +10,7 @@
@class WebError;
@class WebResource;
@class NSURLRequest;
- at class WebResponse;
+ at class NSURLResponse;
@protocol WebResourceDelegate;
@@ -22,7 +22,7 @@
NSURLRequest *request;
@private
WebView *controller;
- WebResponse *response;
+ NSURLResponse *response;
id identifier;
id resourceLoadDelegate;
id downloadDelegate;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 02f0c17..bc00912 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -11,7 +11,7 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
@@ -179,7 +179,7 @@
return request;
}
--(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 92115cb..96b83a5 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -13,7 +13,7 @@
@class WebResource;
@class NSURLRequest;
@class NSMutableURLRequest;
- at class WebResponse;
+ at class NSURLResponse;
@protocol WebDocumentRepresentation;
@@ -80,7 +80,7 @@
@method response
@result returns the WebResourceResponse for the data source.
*/
-- (WebResponse *)response;
+- (NSURLResponse *)response;
/*!
@method isLoading
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 8aee51c..83422b9 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -18,7 +18,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
@implementation WebDataSource
@@ -74,7 +74,7 @@
return _private->request;
}
-- (WebResponse *)response
+- (NSURLResponse *)response
{
return _private->response;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 2bdcda0..eb1bc88 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -13,7 +13,7 @@
@class WebIconLoader;
@class WebMainResourceClient;
@class NSURLRequest;
- at class WebResponse;
+ at class NSURLResponse;
@class WebSubresourceClient;
@class WebView;
@@ -43,7 +43,7 @@
// headers, cookie information, canonicalization and redirects.
NSMutableURLRequest *request;
- WebResponse *response;
+ NSURLResponse *response;
// Client for main resource.
WebMainResourceClient *mainClient;
@@ -134,7 +134,7 @@
- (void)_setTitle:(NSString *)title;
- (void)_setURL:(NSURL *)URL;
- (void)_setRequest:(NSURLRequest *)request;
-- (void)_setResponse:(WebResponse *)response;
+- (void)_setResponse:(NSURLResponse *)response;
- (void)_layoutChildren;
- (void)_clearErrors;
- (void)_setMainDocumentError:(WebError *)error;
@@ -173,7 +173,7 @@
- (BOOL)_storedInPageCache;
- (BOOL)_loadingFromPageCache;
-- (void)_addResponse: (WebResponse *)r;
+- (void)_addResponse: (NSURLResponse *)r;
- (NSArray *)_responses;
- (void)_stopLoadingWithError:(WebError *)error;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 4b9c366..617971c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -30,13 +30,13 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPResponse.h>
+#import <WebFoundation/NSHTTPURLResponse.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
@implementation WebDataSourcePrivate
@@ -337,7 +337,7 @@
[oldRequest release];
}
-- (void)_setResponse:(WebResponse *)response
+- (void)_setResponse:(NSURLResponse *)response
{
[_private->response release];
_private->response = [response retain];
@@ -477,8 +477,8 @@
bool reload = loadType == WebFrameLoadTypeReload
|| loadType == WebFrameLoadTypeReloadAllowingStaleData;
- NSDictionary *headers = [_private->response isKindOfClass:[WebHTTPResponse class]]
- ? [(WebHTTPResponse *)_private->response header] : nil;
+ NSDictionary *headers = [_private->response isKindOfClass:[NSHTTPURLResponse class]]
+ ? [(NSHTTPURLResponse *)_private->response header] : nil;
[frame _closeOldDataSources];
@@ -696,7 +696,7 @@
return _private->loadingFromPageCache;
}
-- (void)_addResponse: (WebResponse *)r
+- (void)_addResponse: (NSURLResponse *)r
{
if (!_private->responses)
_private->responses = [[NSMutableArray alloc] init];
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 48069a1..c6398f7 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -10,7 +10,7 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index 952a2c8..aea2a32 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -6,7 +6,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
@@ -38,7 +38,7 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
return newRequest;
}
--(void)webView: (WebView *)wv resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didReceiveResponse: (NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ac38272..aa6f0b0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -33,7 +33,7 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebSynchronousResult.h>
@@ -826,7 +826,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _restoreScrollPosition];
NSArray *responses = [[self dataSource] _responses];
- WebResponse *response;
+ NSURLResponse *response;
int i, count = [responses count];
for (i = 0; i < count; i++){
response = [responses objectAtIndex: i];
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 3e46f13..951d1c2 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -14,7 +14,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
@implementation WebFrameViewPrivate
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index fa48d39..f1bd70b 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -11,7 +11,7 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDOMElement.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
@interface WebHTMLRepresentationPrivate : NSObject
{
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index a0a4ef0..e1e7526 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -10,7 +10,7 @@
@class WebError;
@class WebResource;
@class NSURLRequest;
- at class WebResponse;
+ at class NSURLResponse;
@protocol WebResourceDelegate;
@@ -22,7 +22,7 @@
NSURLRequest *request;
@private
WebView *controller;
- WebResponse *response;
+ NSURLResponse *response;
id identifier;
id resourceLoadDelegate;
id downloadDelegate;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 02f0c17..bc00912 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -11,7 +11,7 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
@@ -179,7 +179,7 @@
return request;
}
--(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 44ada66..f626175 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -25,7 +25,7 @@
int _contentLength; // for logging only
int _bytesReceived; // for logging only
WebPolicyDecisionListener *listener;
- WebResponse *policyResponse;
+ NSURLResponse *policyResponse;
WebResourceDelegateProxy *proxy;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index a38d57f..28528a7 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -13,8 +13,9 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
-#import <WebFoundation/WebMutableResponse.h>
+#import <WebFoundation/NSURLResponse.h>
+#import <WebFoundation/NSURLResponsePrivate.h>
+
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
@@ -26,7 +27,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
-#import <WebKit/WebResourceResponseExtras.h>
+#import <WebKit/WebNSURLResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -137,7 +138,7 @@
return newRequest;
}
--(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResponse *)r
+-(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(NSURLResponse *)r
{
[[dataSource _controller] setDefersCallbacks:NO];
NSURLRequest *req = [dataSource request];
@@ -180,13 +181,13 @@
-(void)continueAfterContentPolicy:(WebPolicyAction)policy
{
- WebResponse *r = [policyResponse retain];
+ NSURLResponse *r = [policyResponse retain];
[self cancelContentPolicy];
[self continueAfterContentPolicy:policy response:r];
[r release];
}
--(void)checkContentPolicyForResponse:(WebResponse *)r
+-(void)checkContentPolicyForResponse:(NSURLResponse *)r
{
listener = [[WebPolicyDecisionListener alloc]
_initWithTarget:self action:@selector(continueAfterContentPolicy:)];
@@ -201,7 +202,7 @@
}
--(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -273,7 +274,7 @@
if ([[r URL] _web_shouldLoadAsEmptyDocument]) {
[self resource:resource willSendRequest:r];
- WebResponse *rsp = [[WebResponse alloc] init];
+ NSURLResponse *rsp = [[NSURLResponse alloc] init];
[rsp setURL:[[[self dataSource] request] URL]];
[rsp setContentType:@"text/html"];
[rsp setContentLength:0];
@@ -307,7 +308,7 @@
return [delegate resource:resource willSendRequest:request];
}
--(void)resource:(WebResource *)resource didReceiveResponse:(WebResponse *)response
+-(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)response
{
ASSERT(delegate);
[delegate resource:resource didReceiveResponse:response];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 44ada66..f626175 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -25,7 +25,7 @@
int _contentLength; // for logging only
int _bytesReceived; // for logging only
WebPolicyDecisionListener *listener;
- WebResponse *policyResponse;
+ NSURLResponse *policyResponse;
WebResourceDelegateProxy *proxy;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index a38d57f..28528a7 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -13,8 +13,9 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/WebResponse.h>
-#import <WebFoundation/WebMutableResponse.h>
+#import <WebFoundation/NSURLResponse.h>
+#import <WebFoundation/NSURLResponsePrivate.h>
+
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
@@ -26,7 +27,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
-#import <WebKit/WebResourceResponseExtras.h>
+#import <WebKit/WebNSURLResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -137,7 +138,7 @@
return newRequest;
}
--(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResponse *)r
+-(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(NSURLResponse *)r
{
[[dataSource _controller] setDefersCallbacks:NO];
NSURLRequest *req = [dataSource request];
@@ -180,13 +181,13 @@
-(void)continueAfterContentPolicy:(WebPolicyAction)policy
{
- WebResponse *r = [policyResponse retain];
+ NSURLResponse *r = [policyResponse retain];
[self cancelContentPolicy];
[self continueAfterContentPolicy:policy response:r];
[r release];
}
--(void)checkContentPolicyForResponse:(WebResponse *)r
+-(void)checkContentPolicyForResponse:(NSURLResponse *)r
{
listener = [[WebPolicyDecisionListener alloc]
_initWithTarget:self action:@selector(continueAfterContentPolicy:)];
@@ -201,7 +202,7 @@
}
--(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -273,7 +274,7 @@
if ([[r URL] _web_shouldLoadAsEmptyDocument]) {
[self resource:resource willSendRequest:r];
- WebResponse *rsp = [[WebResponse alloc] init];
+ NSURLResponse *rsp = [[NSURLResponse alloc] init];
[rsp setURL:[[[self dataSource] request] URL]];
[rsp setContentType:@"text/html"];
[rsp setContentLength:0];
@@ -307,7 +308,7 @@
return [delegate resource:resource willSendRequest:request];
}
--(void)resource:(WebResource *)resource didReceiveResponse:(WebResponse *)response
+-(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)response
{
ASSERT(delegate);
[delegate resource:resource didReceiveResponse:response];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index f67668c..abc15c2 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -11,7 +11,7 @@
@class WebError;
@class WebFrame;
@class WebPolicyPrivate;
- at class WebResponse;
+ at class NSURLResponse;
@class NSURLRequest;
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index b8011c3..ec35cef 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -7,7 +7,7 @@
@class WebView;
@class WebDataSource;
@class WebPlugInError;
- at class WebResponse;
+ at class NSURLResponse;
@class NSURLRequest;
/*!
@@ -65,7 +65,7 @@
should assume that each new response resets progress so far for the resource back to 0,
and should check the new response for the expected content length.
*/
--(void)webView:(WebView *)sender resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
+-(void)webView:(WebView *)sender resource:identifier didReceiveResponse: (NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveContentLength:fromDataSource:
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index 2c906f2..e7e8e5f 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -6,7 +6,7 @@
#import "WebTextRepresentation.h"
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
@implementation WebTextRepresentation
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 8efd1aa..4bd16e5 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -6,7 +6,7 @@
#import <WebKit/WebTextView.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list