[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:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit cf5ed28ad1ce3b3557dd6ba32b71e52013e30182
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 24 17:29:57 2003 +0000
Tests:
Reviewed by John
Changed WebRequest to NSURLRequest. Several other names,
like some constants whose names were based on WebRequest,
changed as well.
* Carbon/CarbonWeb/MyWebResourceLoadAdapter.m:
(-[MyWebResourceLoadAdapter webView:identifierForInitialRequest:fromDataSource:]):
* Carbon/CarbonWeb/MyWebWindowOperationsAdapter.m:
(-[MyWebWindowOperationsAdapter controller:createWindowWithRequest:]):
* Carbon/CarbonWeb/TWebWindow.h:
* Downloader/MyDocument.m:
(-[MyDocument downloadCancel:]):
(-[MyDocument download:didStartFromRequest:]):
(-[MyDocument download:willSendRequest:]):
* DumpBackForward/main.m:
(dumpBackForward):
(-[CheapWindowOpsDelegate webView:createWindowWithRequest:]):
* DumpRenderTree/main.m:
(dumpRenderTree):
* HeaderView/DocumentController.m:
(-[DocumentController loadURL:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
* IBViewer/DocumentController.m:
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
* PDFBundle/PDFView.h:
* PDFBundle/PDFView.m:
(-[PDFResourceDelegate resource:willSendRequest:]):
(-[PDFView initWithFrame:pageURL:resourceURL:]):
* PDFViewer/DocumentController.m:
(-[DocumentController loadURL:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
* SimpleViewer/DocumentController.m:
(-[DocumentController loadURL:]):
(-[DocumentController webView:identifierForInitialRequest:fromDataSource:]):
(-[DocumentController webView:resource:willSendRequest:fromDataSource:]):
* SnippetEditor/DataResourceRequest.h:
* SnippetEditor/SnippetController.m:
(-[SnippetController updateFromURL:]):
WebFoundation:
Reviewed by John
Changed WebRequest to NSURLRequest. Several other names,
like some constants whose names were based on WebRequest,
changed as well.
In the repository:
Moved WebRequest.h to NSURLRequest.h
Moved WebRequest.m to NSURLRequest.m
Moved WebRequestPrivate.h to NSURLRequestPrivate.h
* CacheLoader.subproj/WebCacheManager.m:
* CacheLoader.subproj/WebProtocol.h:
* CacheLoader.subproj/WebProtocol.m:
(+[WebProtocol partOfRequest:withClass:createIfDoesNotExist:]):
(-[WebProtocol initWithProtocolClient:request:]):
(-[WebProtocol request]):
* CacheLoader.subproj/WebProtocolClient.h:
* CacheLoader.subproj/WebResource.h:
* CacheLoader.subproj/WebResource.m:
(-[WebResource initWithRequest:]):
(+[WebResource sendSynchronousRequest:]):
(+[WebResource canInitWithRequest:]):
(-[WebResource _sendWillSendRequestCallback]):
(-[WebResource _beginLoad]):
(-[WebResource _redirectedToRequest:permanent:]):
(-[WebResource request]):
(-[WebResourceInternal request]):
(-[WebResourceInternal redirectedToRequest:permanent:]):
* CacheLoader.subproj/WebResourceDelegate.h:
* CacheLoader.subproj/WebResourceQueue.m:
* CacheLoader.subproj/WebResponse.h:
* CacheLoader.subproj/WebSynchronousDelegate.h:
* CacheLoader.subproj/WebSynchronousDelegate.m:
(-[WebSynchronousDelegate initWithRequest:monitor:]):
(-[WebSynchronousDelegate resource:willSendRequest:]):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebFoundation.h:
* ProtocolHandlers.subproj/WebAboutProtocol.m:
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
(-[WebCFNetworkHTTPProtocol initWithProtocolClient:request:]):
(-[WebCFNetworkHTTPProtocol addAcceptFieldsToHeader]):
(-[WebCFNetworkHTTPProtocol buildHTTPRequest]):
* ProtocolHandlers.subproj/WebFTPProtocol.m:
(-[WebFTPProtocol initWithProtocolClient:request:]):
(-[WebFTPProtocol determineErrorAndFail]):
(-[WebFTPProtocol _checkDirectoryListing]):
* ProtocolHandlers.subproj/WebFileProtocol.m:
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol initWithProtocolClient:request:]):
(-[WebHTTPProtocol determineErrorAndFail]):
(-[WebHTTPProtocol canStoreCacheObject:]):
(-[WebHTTPProtocol retryWithRedirectedURLAndResultCode:]):
(-[WebHTTPProtocol stateForCacheObject:]):
* ProtocolHandlers.subproj/WebHTTPRequest.h:
* ProtocolHandlers.subproj/WebHTTPRequest.m:
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(-[WebSimpleHTTPProtocol initWithProtocolClient:request:]):
(-[WebSimpleHTTPProtocol _addRequestMessageBody]):
(-[WebSimpleHTTPProtocol buildHTTPRequest]):
(-[WebSimpleHTTPProtocol _forwardToCFNetwork]):
* WebFoundation.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by John
Changed WebRequest to NSURLRequest. Several other names,
like some constants whose names were based on WebRequest,
changed as well.
* Downloads.subproj/WebDownload.h:
* Downloads.subproj/WebDownload.m:
(-[WebDownload initWithRequest:]):
(-[WebDownload _initWithLoadingResource:request:response:delegate:proxy:]):
(+[WebDownload _downloadWithLoadingResource:request:response:delegate:proxy:]):
(-[WebDownload _setRequest:]):
(-[WebDownload resource:willSendRequest:]):
* Downloads.subproj/WebDownloadPrivate.h:
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading]):
(-[WebIconLoader resource:willSendRequest:]):
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView requestWithURLCString:]):
(-[WebBaseNetscapePluginView loadPluginRequest:]):
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
(-[WebBaseNetscapePluginView getURLNotify:target:notifyData:]):
(-[WebBaseNetscapePluginView getURL:target:]):
(-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
(-[WebPluginRequest initWithRequest:frameName:notifyData:]):
(-[WebPluginRequest request]):
* Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
(-[WebNetscapePluginEmbeddedView viewDidMoveToWindow]):
* Plugins.subproj/WebNetscapePluginStream.h:
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
* Plugins.subproj/WebPluginController.m:
(-[WebPluginController showURL:inFrame:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge createWindowWithURL:frameName:]):
(-[WebBridge objectLoadedFromCacheWithURL:response:size:]):
(-[WebBridge isReloading]):
(-[WebBridge loadEmptyDocumentSynchronously]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
(-[WebSubresourceClient resource:willSendRequest:]):
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate startLoading:]):
(-[WebBaseResourceHandleDelegate loadWithRequest:]):
(-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource initWithRequest:]):
(-[WebDataSource initialRequest]):
(-[WebDataSource request]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _setURL:]):
(-[WebDataSource _setRequest:]):
(-[WebDataSource _originalRequest]):
(-[WebDataSource _lastCheckedRequest]):
(-[WebDataSource _setLastCheckedRequest:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
(-[WebDefaultPolicyDelegate webView:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:willSendRequest:fromDataSource:]):
* WebView.subproj/WebDefaultWindowOperationsDelegate.m:
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
(-[WebFrame loadRequest:]):
(-[WebFrame reload]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _createItem]):
(-[WebFrame _loadItem:fromItem:withLoadType:]):
(-[WebFrame _loadRequest:triggeringAction:loadType:formState:]):
(-[WebFrame _invalidatePendingPolicyDecisionCallingDefaultAction:]):
(-[WebFrame _checkNewWindowPolicyForRequest:action:frameName:formState:andCall:withSelector:]):
(-[WebFrame _continueAfterNewWindowPolicy:]):
(-[WebFrame _checkNavigationPolicyForRequest:dataSource:formState:andCall:withSelector:]):
(-[WebFrame _continueAfterNavigationPolicy:]):
(-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formState:]):
(-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
(-[WebFrame _continueLoadRequestAfterNewWindowPolicy:frameName:formState:]):
(-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
(-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
(-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
(-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]):
(-[WebFrame _loadRequest:inFrameNamed:]):
* WebView.subproj/WebFrameView.m:
(-[WebFrameView concludeDragOperation:]):
* WebView.subproj/WebImageRepresentation.m:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterNavigationPolicy:formState:]):
(-[WebMainResourceClient resource:willSendRequest:]):
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
(-[WebMainResourceClient startLoading:]):
(-[WebResourceDelegateProxy resource:willSendRequest:]):
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebView.m:
(-[WebView takeStringURLFrom:]):
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
(-[WebView _downloadURL:toDirectory:]):
(-[WebView _openNewWindowWithRequest:]):
* WebView.subproj/WebWindowOperationsDelegate.h:
WebBrowser:
Reviewed by John
Changed WebRequest to NSURLRequest. Several other names,
like some constants whose names were based on WebRequest,
changed as well.
* BrowserDocument.h:
* BrowserDocument.m:
(-[BrowserDocument initWithContentsOfRequest:frameName:]):
(-[BrowserDocument initWithContentsOfURL:ofType:]):
(-[BrowserDocument goToRequest:]):
* BrowserDocumentController.h:
* BrowserDocumentController.m:
(-[BrowserDocumentController _openDocumentWithContentsOfRequest:behind:display:frameName:]):
(-[BrowserDocumentController openDocumentWithContentsOfRequest:behind:display:]):
(-[BrowserDocumentController openDocumentWithContentsOfURL:display:]):
(-[BrowserDocumentController reuseWebController:forRequest:]):
(-[BrowserDocumentController _goToEachRequest:windowPolicy:frameName:]):
(-[BrowserDocumentController openDocument:]):
(-[BrowserDocumentController goToURL:windowPolicy:]):
(-[BrowserDocumentController goToRequest:windowPolicy:frameName:]):
(-[BrowserDocumentController goToRequest:windowPolicy:]):
* BrowserWebController.h:
* BrowserWebController.m:
(-[BrowserWebController initWithDocument:request:frameName:]):
(-[BrowserWebController webView:createWindowWithRequest:]):
(-[BrowserWebController openFileExternallyWithRequest:inFrame:]):
(-[BrowserWebController openURLExternallyWithRequest:inFrame:]):
(-[BrowserWebController revealInFinderWithRequest:inFrame:]):
(-[BrowserWebController webView:decideContentPolicyForMIMEType:andRequest:inFrame:decisionListener:]):
(-[BrowserWebController decidePolicyForAction:andRequest:inFrame:newFrameName:decisionListener:]):
(-[BrowserWebController webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
(-[BrowserWebController webView:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
(-[BrowserWebController expectedOrCurrentURL]):
(-[BrowserWebController queueRequest:]):
(-[BrowserWebController removeRequestFromQueue]):
(-[BrowserWebController goNowIfInQueue]):
(-[BrowserWebController goToRequest:allowJavaScript:waitInQueue:]):
(-[BrowserWebController goToURL:withFallbackURLs:]):
* BrowserWindowController.m:
(-[BrowserWindowController replaceTabURLs:usingTabLabelsFromBookmarks:]):
* BugReportController.m:
(-[BugReportController sendBugReportToAppleWithScreenShot:source:]):
(-[BugReportController resource:willSendRequest:]):
* ContextMenuHandler.m:
(-[ContextMenuHandler webView:contextMenuItemsForElement:defaultMenuItems:]):
* Debug/SnippetController.m:
(-[SnippetController load]):
* DownloadMonitor.h:
* DownloadMonitor.m:
(-[DownloadMonitor download:didStartFromRequest:]):
(-[DownloadMonitor downloadMayBeOpenedForRequest:]):
* DownloadProgressEntry.h:
* DownloadProgressEntry.m:
(-[DownloadProgressEntry _setRequest:]):
* FrameProgressEntry.m:
* LoadProgressMonitor.h:
* LoadProgressMonitor.m:
(-[LoadProgressMonitor _createProgressEntryWithRequest:dataSource:]):
(-[LoadProgressMonitor webView:identifierForInitialRequest:fromDataSource:]):
(-[LoadProgressMonitor webView:resource:willSendRequest:fromDataSource:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler unknownRootSheetDidEnd:returnCode:contextInfo:]):
(-[LocationChangeHandler webView:locationChangeDone:forDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3901 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a2bed0b..c420fd6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,115 @@
+2003-03-24 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by John
+
+ Changed WebRequest to NSURLRequest. Several other names,
+ like some constants whose names were based on WebRequest,
+ changed as well.
+
+ * Downloads.subproj/WebDownload.h:
+ * Downloads.subproj/WebDownload.m:
+ (-[WebDownload initWithRequest:]):
+ (-[WebDownload _initWithLoadingResource:request:response:delegate:proxy:]):
+ (+[WebDownload _downloadWithLoadingResource:request:response:delegate:proxy:]):
+ (-[WebDownload _setRequest:]):
+ (-[WebDownload resource:willSendRequest:]):
+ * Downloads.subproj/WebDownloadPrivate.h:
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading]):
+ (-[WebIconLoader resource:willSendRequest:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView requestWithURLCString:]):
+ (-[WebBaseNetscapePluginView loadPluginRequest:]):
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ (-[WebBaseNetscapePluginView getURLNotify:target:notifyData:]):
+ (-[WebBaseNetscapePluginView getURL:target:]):
+ (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
+ (-[WebPluginRequest initWithRequest:frameName:notifyData:]):
+ (-[WebPluginRequest request]):
+ * Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ (-[WebNetscapePluginEmbeddedView viewDidMoveToWindow]):
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+ * Plugins.subproj/WebPluginController.m:
+ (-[WebPluginController showURL:inFrame:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge createWindowWithURL:frameName:]):
+ (-[WebBridge objectLoadedFromCacheWithURL:response:size:]):
+ (-[WebBridge isReloading]):
+ (-[WebBridge loadEmptyDocumentSynchronously]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ (-[WebSubresourceClient resource:willSendRequest:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate startLoading:]):
+ (-[WebBaseResourceHandleDelegate loadWithRequest:]):
+ (-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithRequest:]):
+ (-[WebDataSource initialRequest]):
+ (-[WebDataSource request]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setURL:]):
+ (-[WebDataSource _setRequest:]):
+ (-[WebDataSource _originalRequest]):
+ (-[WebDataSource _lastCheckedRequest]):
+ (-[WebDataSource _setLastCheckedRequest:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
+ (-[WebDefaultPolicyDelegate webView:decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:]):
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:willSendRequest:fromDataSource:]):
+ * WebView.subproj/WebDefaultWindowOperationsDelegate.m:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame loadRequest:]):
+ (-[WebFrame reload]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _createItem]):
+ (-[WebFrame _loadItem:fromItem:withLoadType:]):
+ (-[WebFrame _loadRequest:triggeringAction:loadType:formState:]):
+ (-[WebFrame _invalidatePendingPolicyDecisionCallingDefaultAction:]):
+ (-[WebFrame _checkNewWindowPolicyForRequest:action:frameName:formState:andCall:withSelector:]):
+ (-[WebFrame _continueAfterNewWindowPolicy:]):
+ (-[WebFrame _checkNavigationPolicyForRequest:dataSource:formState:andCall:withSelector:]):
+ (-[WebFrame _continueAfterNavigationPolicy:]):
+ (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formState:]):
+ (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
+ (-[WebFrame _continueLoadRequestAfterNewWindowPolicy:frameName:formState:]):
+ (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+ (-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ (-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
+ (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]):
+ (-[WebFrame _loadRequest:inFrameNamed:]):
+ * WebView.subproj/WebFrameView.m:
+ (-[WebFrameView concludeDragOperation:]):
+ * WebView.subproj/WebImageRepresentation.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterNavigationPolicy:formState:]):
+ (-[WebMainResourceClient resource:willSendRequest:]):
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ (-[WebMainResourceClient startLoading:]):
+ (-[WebResourceDelegateProxy resource:willSendRequest:]):
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebView.m:
+ (-[WebView takeStringURLFrom:]):
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _downloadURL:toDirectory:]):
+ (-[WebView _openNewWindowWithRequest:]):
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+
2003-03-21 Chris Blumenberg <cblu at apple.com>
Fixed: 3081681 - text/calendar should be downloaded instead of displayed
diff --git a/WebKit/Downloads.subproj/WebDownload.h b/WebKit/Downloads.subproj/WebDownload.h
index 67ca8cf..4fbf681 100644
--- a/WebKit/Downloads.subproj/WebDownload.h
+++ b/WebKit/Downloads.subproj/WebDownload.h
@@ -9,7 +9,7 @@
@class WebDownloadPrivate;
@class WebError;
- at class WebRequest;
+ at class NSURLRequest;
@class WebResponse;
@protocol WebDownloadDecisionListener;
@@ -31,7 +31,7 @@
@abstract Initializes a WebDownload object.
@param request The request to download. Must not be nil.
*/
-- initWithRequest:(WebRequest *)request;
+- initWithRequest:(NSURLRequest *)request;
/*!
@method loadWithDelegate:
@@ -60,7 +60,7 @@
@param download The download that just started downloading.
@param request The request that the download started from.
*/
-- (void)download:(WebDownload *)download didStartFromRequest:(WebRequest *)request;
+- (void)download:(WebDownload *)download didStartFromRequest:(NSURLRequest *)request;
/*!
@method download:willSendRequest:
@@ -74,7 +74,7 @@
@result The request to be used; either the request parameter or a replacement. If nil is returned,
the download is cancelled.
*/
-- (WebRequest *)download:(WebDownload *)download willSendRequest:(WebRequest *)request;
+- (NSURLRequest *)download:(WebDownload *)download willSendRequest:(NSURLRequest *)request;
/*!
@method download:didReceiveResponse:
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index bbd87cc..88d9d28 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -21,7 +21,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/WebResponse.h>
@@ -55,7 +55,7 @@ typedef struct WebFSRefParam
BOOL encounteredCloseError;
WebResource *resource;
- WebRequest *request;
+ NSURLRequest *request;
WebResponse *response;
WebResourceDelegateProxy *proxy;
@@ -77,7 +77,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
#pragma mark LOADING
- (void)_downloadStarted;
- (void)_downloadEnded;
-- (void)_setRequest:(WebRequest *)request;
+- (void)_setRequest:(NSURLRequest *)request;
- (void)_setResponse:(WebResponse *)response;
#pragma mark CREATING
- (NSString *)_pathWithUniqueFilenameForPath:(NSString *)path;
@@ -158,7 +158,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
@implementation WebDownload
-- initWithRequest:(WebRequest *)request
+- initWithRequest:(NSURLRequest *)request
{
ASSERT(request);
@@ -177,7 +177,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
- _initWithLoadingResource:(WebResource *)resource
- request:(WebRequest *)request
+ request:(NSURLRequest *)request
response:(WebResponse *)response
delegate:(id)delegate
proxy:(WebResourceDelegateProxy *)proxy
@@ -200,7 +200,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
if ([_private->delegate respondsToSelector:@selector(download:willSendRequest:)]) {
- WebRequest *request = [_private->delegate download:self willSendRequest:_private->request];
+ NSURLRequest *request = [_private->delegate download:self willSendRequest:_private->request];
if (request != _private->request) {
// If the request is altered, cancel the resource and start a new one.
[self cancel];
@@ -228,7 +228,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
+ _downloadWithLoadingResource:(WebResource *)resource
- request:(WebRequest *)request
+ request:(NSURLRequest *)request
response:(WebResponse *)response
delegate:(id)delegate
proxy:(WebResourceDelegateProxy *)proxy
@@ -303,7 +303,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
-- (void)_setRequest:(WebRequest *)request
+- (void)_setRequest:(NSURLRequest *)request
{
if (_private->request != request) {
[_private->request release];
@@ -319,9 +319,9 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
--(WebRequest *)resource:(WebResource *)resource willSendRequest:(WebRequest *)theRequest
+-(NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)theRequest
{
- WebRequest *request = nil;
+ NSURLRequest *request = nil;
if ([_private->delegate respondsToSelector:@selector(download:willSendRequest:)]) {
request = [_private->delegate download:self willSendRequest:theRequest];
diff --git a/WebKit/Downloads.subproj/WebDownloadPrivate.h b/WebKit/Downloads.subproj/WebDownloadPrivate.h
index 3175aa5..504f32b 100644
--- a/WebKit/Downloads.subproj/WebDownloadPrivate.h
+++ b/WebKit/Downloads.subproj/WebDownloadPrivate.h
@@ -7,14 +7,14 @@
#import <WebKit/WebDownload.h>
- at class WebRequest;
+ at class NSURLRequest;
@class WebResource;
@class WebResponse;
@class WebResourceDelegateProxy;
@interface WebDownload (WebPrivate)
+ _downloadWithLoadingResource:(WebResource *)resource
- request:(WebRequest *)request
+ request:(NSURLRequest *)request
response:(WebResponse *)response
delegate:(id)delegate
proxy:(WebResourceDelegateProxy *)proxy;
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 21fa8ab..56eaad4 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -13,7 +13,7 @@
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebHTTPRequest.h>
#define WebIconLoaderWeeksWorthOfSeconds (60 * 60 * 24 * 7)
@@ -84,7 +84,7 @@
return;
}
- WebRequest *request = [[WebRequest alloc] initWithURL:_private->URL];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:_private->URL];
[request setPageNotFoundCacheLifetime:WebIconLoaderWeeksWorthOfSeconds];
_private->handle = [[WebResource alloc] initWithRequest:request];
[_private->handle loadWithDelegate:self];
@@ -108,7 +108,7 @@
}
}
--(WebRequest *)resource:(WebResource *)resource willSendRequest:(WebRequest *)request
+-(NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)request
{
return request;
}
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index d3e5d0d..20bfecc 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -49,14 +49,14 @@ typedef struct {
@interface WebPluginRequest : NSObject
{
- WebRequest *_request;
+ NSURLRequest *_request;
NSString *_frameName;
void *_notifyData;
}
-- (id)initWithRequest:(WebRequest *)request frameName:(NSString *)frameName notifyData:(void *)notifyData;
+- (id)initWithRequest:(NSURLRequest *)request frameName:(NSString *)frameName notifyData:(void *)notifyData;
-- (WebRequest *)request;
+- (NSURLRequest *)request;
- (NSString *)frameName;
- (void *)notifyData;
@@ -1007,7 +1007,7 @@ typedef struct {
@implementation WebBaseNetscapePluginView (WebNPPCallbacks)
-- (WebRequest *)requestWithURLCString:(const char *)URLCString
+- (NSURLRequest *)requestWithURLCString:(const char *)URLCString
{
if (!URLCString) {
return nil;
@@ -1021,12 +1021,12 @@ typedef struct {
return nil;
}
- return [WebRequest requestWithURL:URL];
+ return [NSURLRequest requestWithURL:URL];
}
- (void)loadPluginRequest:(WebPluginRequest *)pluginRequest
{
- WebRequest *request = [pluginRequest request];
+ NSURLRequest *request = [pluginRequest request];
NSString *frameName = [pluginRequest frameName];
void *notifyData = [pluginRequest notifyData];
@@ -1077,7 +1077,7 @@ typedef struct {
}
}
-- (NPError)loadRequest:(WebRequest *)request inTarget:(const char *)cTarget withNotifyData:(void *)notifyData
+- (NPError)loadRequest:(NSURLRequest *)request inTarget:(const char *)cTarget withNotifyData:(void *)notifyData
{
if (![request URL]) {
return NPERR_INVALID_URL;
@@ -1111,7 +1111,7 @@ typedef struct {
{
LOG(Plugins, "NPN_GetURLNotify: %s target: %s", URLCString, cTarget);
- WebRequest *request = [self requestWithURLCString:URLCString];
+ NSURLRequest *request = [self requestWithURLCString:URLCString];
return [self loadRequest:request inTarget:cTarget withNotifyData:notifyData];
}
@@ -1119,7 +1119,7 @@ typedef struct {
{
LOG(Plugins, "NPN_GetURL: %s target: %s", URLCString, cTarget);
- WebRequest *request = [self requestWithURLCString:URLCString];
+ NSURLRequest *request = [self requestWithURLCString:URLCString];
return [self loadRequest:request inTarget:cTarget withNotifyData:NULL];
}
@@ -1163,7 +1163,7 @@ typedef struct {
return NPERR_INVALID_PARAM;
}
- WebRequest *request = [self requestWithURLCString:URLCString];
+ NSURLRequest *request = [self requestWithURLCString:URLCString];
[request setRequestMethod:@"POST"];
if (allowHeaders) {
@@ -1279,7 +1279,7 @@ typedef struct {
@implementation WebPluginRequest
-- (id)initWithRequest:(WebRequest *)request frameName:(NSString *)frameName notifyData:(void *)notifyData
+- (id)initWithRequest:(NSURLRequest *)request frameName:(NSString *)frameName notifyData:(void *)notifyData
{
[super init];
_request = [request retain];
@@ -1295,7 +1295,7 @@ typedef struct {
[super dealloc];
}
-- (WebRequest *)request
+- (NSURLRequest *)request
{
return _request;
}
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
index 90771f6..c25db2a 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
@@ -5,11 +5,11 @@
#import <WebBaseNetscapePluginView.h>
- at class WebRequest;
+ at class NSURLRequest;
@interface WebBaseNetscapePluginView (WebNPPCallbacks)
-- (NPError)loadRequest:(WebRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData;
+- (NPError)loadRequest:(NSURLRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData;
- (NPError)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData;
- (NPError)getURL:(const char *)URL target:(const char *)target;
- (NPError)postURLNotify:(const char *)URL target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index cde7c8f..117abb4 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -12,7 +12,7 @@
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
@implementation WebNetscapePluginEmbeddedView
@@ -53,7 +53,7 @@
[super viewDidMoveToWindow];
if ([self window] && [self start] && URL) {
- WebRequest *request = [WebRequest requestWithURL:URL];
+ NSURLRequest *request = [NSURLRequest requestWithURL:URL];
[self loadRequest:request inTarget:nil withNotifyData:nil];
}
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
index e3c5f08..b9f0c41 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -10,17 +10,17 @@
@class WebNetscapePluginEmbeddedView;
@class WebResource;
- at class WebRequest;
+ at class NSURLRequest;
@interface WebNetscapePluginStream : WebBaseNetscapePluginStream
{
WebNetscapePluginEmbeddedView *view;
NSMutableData *resourceData;
- WebRequest *_startingRequest;
+ NSURLRequest *_startingRequest;
}
-- initWithRequest:(WebRequest *)theRequest
+- initWithRequest:(NSURLRequest *)theRequest
pluginPointer:(NPP)thePluginPointer
notifyData:(void *)theNotifyData;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 3341eed..836b35b 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -10,12 +10,12 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebFoundation.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResource.h>
@implementation WebNetscapePluginStream
-- initWithRequest:(WebRequest *)theRequest
+- initWithRequest:(NSURLRequest *)theRequest
pluginPointer:(NPP)thePluginPointer
notifyData:(void *)theNotifyData
{
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index 25898e3..189e4d8 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -19,7 +19,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
@implementation WebPluginController
@@ -103,7 +103,7 @@
ERROR("could not load URL %@ because plug-in has already been stopped", URL);
return;
}
- WebRequest *request = [WebRequest requestWithURL:URL];
+ NSURLRequest *request = [NSURLRequest requestWithURL:URL];
if (!request) {
ERROR("could not load URL %@", URL);
return;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 5665822..48a2b5d 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -104,10 +104,10 @@
{
ASSERT(frame != nil);
- WebRequest *request = nil;
+ NSURLRequest *request = nil;
if (URL != nil && [URL length] > 0) {
- request = [WebRequest requestWithURL:[NSURL _web_URLWithString:URL]];
+ request = [NSURLRequest requestWithURL:[NSURL _web_URLWithString:URL]];
[request setReferrer:[self referrer]];
}
@@ -281,7 +281,7 @@
ASSERT(frame != nil);
ASSERT(response != nil);
- WebRequest *request = [[WebRequest alloc] initWithURL:[NSURL _web_URLWithString:URL]];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL _web_URLWithString:URL]];
WebView *c = [frame webView];
id delegate = [c resourceLoadDelegate];
id _delegate = [c _resourceLoadDelegateForwarder];
@@ -302,7 +302,7 @@
- (BOOL)isReloading
{
- return [[[self dataSource] request] requestCachePolicy] == WebRequestCachePolicyLoadFromOrigin;
+ return [[[self dataSource] request] cachePolicy] == NSURLRequestReloadIgnoringCacheData;
}
- (void)reportClientRedirectToURL:(NSString *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory
@@ -670,7 +670,7 @@ static BOOL loggedObjectCacheSize = NO;
- (void)loadEmptyDocumentSynchronously
{
NSURL *url = [[NSURL alloc] initWithString:@""];
- WebRequest *request = [[WebRequest alloc] initWithURL:url];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:url];
[frame loadRequest:request];
[request release];
[url release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index de06c4f..95f0010 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -13,7 +13,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceDelegate.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebResponse.h>
@@ -45,8 +45,8 @@
[source _addSubresourceClient:client];
- WebRequest *newRequest = [[WebRequest alloc] initWithURL:URL];
- [newRequest setRequestCachePolicy:[[source request] requestCachePolicy]];
+ NSURLRequest *newRequest = [[NSURLRequest alloc] initWithURL:URL];
+ [newRequest setCachePolicy:[[source request] cachePolicy]];
[newRequest setResponseCachePolicy:[[source request] responseCachePolicy]];
[newRequest setReferrer:referrer];
@@ -78,7 +78,7 @@
[[dataSource _controller] _receivedError:error fromDataSource:dataSource];
}
--(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
+-(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
{
// FIXME: We do want to tell the client about redirects for subresources.
// But the current API doesn't give any way to tell redirects on
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index de06c4f..95f0010 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -13,7 +13,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceDelegate.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebResponse.h>
@@ -45,8 +45,8 @@
[source _addSubresourceClient:client];
- WebRequest *newRequest = [[WebRequest alloc] initWithURL:URL];
- [newRequest setRequestCachePolicy:[[source request] requestCachePolicy]];
+ NSURLRequest *newRequest = [[NSURLRequest alloc] initWithURL:URL];
+ [newRequest setCachePolicy:[[source request] cachePolicy]];
[newRequest setResponseCachePolicy:[[source request] responseCachePolicy]];
[newRequest setReferrer:referrer];
@@ -78,7 +78,7 @@
[[dataSource _controller] _receivedError:error fromDataSource:dataSource];
}
--(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
+-(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
{
// FIXME: We do want to tell the client about redirects for subresources.
// But the current API doesn't give any way to tell redirects on
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index f908d4a..a0a4ef0 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -9,7 +9,7 @@
@class WebDataSource;
@class WebError;
@class WebResource;
- at class WebRequest;
+ at class NSURLRequest;
@class WebResponse;
@protocol WebResourceDelegate;
@@ -19,7 +19,7 @@
@protected
WebDataSource *dataSource;
WebResource *resource;
- WebRequest *request;
+ NSURLRequest *request;
@private
WebView *controller;
WebResponse *response;
@@ -31,10 +31,10 @@
BOOL defersCallbacks;
}
-- (BOOL)loadWithRequest:(WebRequest *)request;
+- (BOOL)loadWithRequest:(NSURLRequest *)request;
// this method exists only to be subclassed, don't call it directly
-- (void)startLoading:(WebRequest *)r;
+- (void)startLoading:(NSURLRequest *)r;
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index b46fee6..29b8b10 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -9,7 +9,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -62,12 +62,12 @@
[super dealloc];
}
-- (void)startLoading:(WebRequest *)r
+- (void)startLoading:(NSURLRequest *)r
{
[resource loadWithDelegate:self];
}
-- (BOOL)loadWithRequest:(WebRequest *)r
+- (BOOL)loadWithRequest:(NSURLRequest *)r
{
ASSERT(resource == nil);
@@ -129,7 +129,7 @@
return downloadDelegate;
}
--(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
+-(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 33b21cf..50867c8 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -11,7 +11,7 @@
@class WebError;
@class WebFrame;
@class WebResource;
- at class WebRequest;
+ at class NSURLRequest;
@class WebResponse;
@protocol WebDocumentRepresentation;
@@ -35,7 +35,7 @@
@param request The request to use in creating a datasource.
@result Returns an initialized WebDataSource.
*/
-- (id)initWithRequest:(WebRequest *)request;
+- (id)initWithRequest:(NSURLRequest *)request;
/*!
@method data
@@ -67,13 +67,13 @@
@result Returns a reference to the original request that created the
datasource. This request will be unmodified by WebKit.
*/
-- (WebRequest *)initialRequest;
+- (NSURLRequest *)initialRequest;
/*!
@method request
@result Returns the request that was used to create this datasource.
*/
--(WebRequest *)request;
+-(NSURLRequest *)request;
/*!
@method response
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 6408d8d..8112a1b 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -17,13 +17,13 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
@implementation WebDataSource
--(id)initWithRequest:(WebRequest *)request
+-(id)initWithRequest:(NSURLRequest *)request
{
self = [super init];
if (!self) {
@@ -64,12 +64,12 @@
return _private->webFrame;
}
--(WebRequest *)initialRequest
+-(NSURLRequest *)initialRequest
{
return _private->originalRequest;
}
--(WebRequest *)request
+-(NSURLRequest *)request
{
return _private->request;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 0a22105..2807d67 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -12,7 +12,7 @@
@class WebHistoryItem;
@class WebIconLoader;
@class WebMainResourceClient;
- at class WebRequest;
+ at class NSURLRequest;
@class WebResponse;
@class WebSubresourceClient;
@class WebView;
@@ -32,16 +32,16 @@
// This should only be used by the resourceLoadDelegate's
// identifierForInitialRequest:fromDatasource: method. It is
// not guaranteed to remain unchanged, as requests are mutable.
- WebRequest *originalRequest;
+ NSURLRequest *originalRequest;
// A copy of the original request used to create the data source.
// We have to copy the request because requests are mutable.
- WebRequest *originalRequestCopy;
+ NSURLRequest *originalRequestCopy;
// The 'working' request for this datasource. It may be mutated
// several times from the original request to include additional
// headers, cookie information, canonicalization and redirects.
- WebRequest *request;
+ NSURLRequest *request;
WebResponse *response;
@@ -91,7 +91,7 @@
// The last request that we checked click policy for - kept around
// so we can avoid asking again needlessly.
- WebRequest *lastCheckedRequest;
+ NSURLRequest *lastCheckedRequest;
// We retain all the received responses so we can play back the
// WebResourceLoadDelegate messages if the item is loaded from the
@@ -133,7 +133,7 @@
- (double)_loadingStartedTime;
- (void)_setTitle:(NSString *)title;
- (void)_setURL:(NSURL *)URL;
-- (void)_setRequest:(WebRequest *)request;
+- (void)_setRequest:(NSURLRequest *)request;
- (void)_setResponse:(WebResponse *)response;
- (void)_layoutChildren;
- (void)_clearErrors;
@@ -162,11 +162,11 @@
- (void)_finishedLoading;
- (void)_receivedError:(WebError *)error complete:(BOOL)isComplete;
- (void)_defersCallbacksChanged;
-- (WebRequest *)_originalRequest;
+- (NSURLRequest *)_originalRequest;
- (NSDictionary *)_triggeringAction;
- (void)_setTriggeringAction:(NSDictionary *)action;
-- (WebRequest *)_lastCheckedRequest;
-- (void)_setLastCheckedRequest:(WebRequest *)request;
+- (NSURLRequest *)_lastCheckedRequest;
+- (void)_setLastCheckedRequest:(NSURLRequest *)request;
- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened;
- (BOOL)_justOpenedForTargetedLink;
- (void)_setStoredInPageCache:(BOOL)f;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 400cd3b..695f207 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -34,7 +34,7 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebHTTPRequest.h>
@@ -310,20 +310,20 @@
- (void)_setURL:(NSURL *)URL
{
- WebRequest *newRequest = [_private->request copy];
+ NSURLRequest *newRequest = [_private->request copy];
[_private->request release];
[newRequest setURL:URL];
_private->request = newRequest;
}
-- (void)_setRequest:(WebRequest *)request
+- (void)_setRequest:(NSURLRequest *)request
{
// We should never be getting a redirect callback after the data
// source is committed. It would be a WebFoundation bug if it sent
// a redirect callback after commit.
ASSERT(!_private->committed);
- WebRequest *oldRequest = _private->request;
+ NSURLRequest *oldRequest = _private->request;
_private->request = [request retain];
@@ -638,7 +638,7 @@
[[[self webFrame] children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
}
-- (WebRequest *)_originalRequest
+- (NSURLRequest *)_originalRequest
{
return _private->originalRequestCopy;
}
@@ -656,16 +656,16 @@
}
-- (WebRequest *)_lastCheckedRequest
+- (NSURLRequest *)_lastCheckedRequest
{
// It's OK not to make a copy here because we know the caller
// isn't going to modify this request
return [[_private->lastCheckedRequest retain] autorelease];
}
-- (void)_setLastCheckedRequest:(WebRequest *)request
+- (void)_setLastCheckedRequest:(NSURLRequest *)request
{
- WebRequest *oldRequest = _private->lastCheckedRequest;
+ NSURLRequest *oldRequest = _private->lastCheckedRequest;
_private->lastCheckedRequest = [request copy];
[oldRequest release];
}
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index b10cc9b..1c4e1e9 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -18,7 +18,7 @@
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
@implementation WebDefaultContextMenuDelegate
@@ -105,7 +105,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
linkURL = [element objectForKey:WebElementLinkURLKey];
if (linkURL) {
- if([WebResource canInitWithRequest:[WebRequest requestWithURL:linkURL]]){
+ if([WebResource canInitWithRequest:[NSURLRequest requestWithURL:linkURL]]){
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenLinkInNewWindow]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagDownloadLinkToDisk]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopyLinkToClipboard]];
@@ -142,7 +142,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
WebView *controller = [webFrame webView];
- WebRequest *request = [WebRequest requestWithURL:URL];
+ NSURLRequest *request = [NSURLRequest requestWithURL:URL];
NSString *referrer = [[webFrame _bridge] referrer];
if (referrer) {
[request setReferrer:referrer];
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 27bebaa..48069a1 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -9,7 +9,7 @@
#import <WebKit/WebView.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebAssertions.h>
@@ -35,7 +35,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
- (void)webView: (WebView *)wv decideContentPolicyForMIMEType:(NSString *)type
- andRequest:(WebRequest *)request
+ andRequest:(NSURLRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener;
{
@@ -58,7 +58,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
- (void)webView: (WebView *)wv decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebRequest *)request
+ andRequest:(NSURLRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener
{
@@ -75,7 +75,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
- (void)webView: (WebView *)wv decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebRequest *)request
+ andRequest:(NSURLRequest *)request
newFrameName:(NSString *)frameName
decisionListener:(WebPolicyDecisionListener *)listener
{
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index ce61110..c4c2a80 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -4,7 +4,7 @@
*/
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/WebResponse.h>
@@ -28,12 +28,12 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- webView: (WebView *)wv identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
+- webView: (WebView *)wv identifierForInitialRequest: (NSURLRequest *)request fromDataSource: (WebDataSource *)dataSource
{
return [[[NSObject alloc] init] autorelease];
}
--(WebRequest *)webView: (WebView *)wv resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+-(NSURLRequest *)webView: (WebView *)wv resource:identifier willSendRequest: (NSURLRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
{
return newRequest;
}
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index f72dd17..317d6db 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -4,7 +4,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
#import <WebKit/WebView.h>
@@ -29,7 +29,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
}
-- (WebView *)webView: (WebView *)wv createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView: (WebView *)wv createWindowWithRequest:(NSURLRequest *)request;
{
return nil;
}
diff --git a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
index f72dd17..317d6db 100644
--- a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
@@ -4,7 +4,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebKit/WebDefaultWindowOperationsDelegate.h>
#import <WebKit/WebView.h>
@@ -29,7 +29,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
}
-- (WebView *)webView: (WebView *)wv createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView: (WebView *)wv createWindowWithRequest:(NSURLRequest *)request;
{
return nil;
}
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 76422df..1d07b20 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -13,7 +13,7 @@
@class WebError;
@class WebFramePrivate;
@class WebFrameView;
- at class WebRequest;
+ at class NSURLRequest;
/*!
@class WebFrame
@@ -58,7 +58,7 @@
@method loadRequest:
@param request The web request to load.
*/
--(void)loadRequest:(WebRequest *)request;
+-(void)loadRequest:(NSURLRequest *)request;
/*!
@method dataSource
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 8c1291d..6c4a18e 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -22,7 +22,7 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebNSStringExtras.h>
@@ -94,16 +94,16 @@
return [_private dataSource];
}
-- (void)loadRequest:(WebRequest *)request
+- (void)loadRequest:(NSURLRequest *)request
{
WebFrameLoadType loadType;
// note this copies request
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
- WebRequest *r = [newDataSource request];
+ NSURLRequest *r = [newDataSource request];
[self _addExtraFieldsToRequest:r alwaysFromRequest: NO];
if ([self _shouldTreatURLAsSameAsCurrent:[request URL]]) {
- [r setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ [r setCachePolicy:NSURLRequestReloadIgnoringCacheData];
loadType = WebFrameLoadTypeSame;
} else {
loadType = WebFrameLoadTypeStandard;
@@ -137,8 +137,8 @@
// initWithRequest copies the request
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:[dataSource request]];
- WebRequest *request = [newDataSource request];
- [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ NSURLRequest *request = [newDataSource request];
+ [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
// If we're about to rePOST, set up action so the app can warn the user
if ([[request requestMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 7f83798..5088d76 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -14,7 +14,7 @@
@class WebFrameBridge;
@class WebFrameView;
@class WebHistoryItem;
- at class WebRequest;
+ at class NSURLRequest;
@class WebPolicyDecisionListener;
@class WebView;
@@ -70,7 +70,7 @@ typedef enum {
WebPolicyDecisionListener *listener;
// state we'll need to continue after waiting for the policy delegate's decision
- WebRequest *policyRequest;
+ NSURLRequest *policyRequest;
NSString *policyFrameName;
id policyTarget;
SEL policySelector;
@@ -124,12 +124,12 @@ typedef enum {
- (void)_setLoadType: (WebFrameLoadType)loadType;
- (WebFrameLoadType)_loadType;
-- (void)_addExtraFieldsToRequest:(WebRequest *)request alwaysFromRequest: (BOOL)f;
+- (void)_addExtraFieldsToRequest:(NSURLRequest *)request alwaysFromRequest: (BOOL)f;
-- (void)_checkNewWindowPolicyForRequest:(WebRequest *)request action:(NSDictionary *)action frameName:(NSString *)frameName formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector;
+- (void)_checkNewWindowPolicyForRequest:(NSURLRequest *)request action:(NSDictionary *)action frameName:(NSString *)frameName formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector;
-- (void)_checkNavigationPolicyForRequest:(WebRequest *)request dataSource:(WebDataSource *)dataSource formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector;
+- (void)_checkNavigationPolicyForRequest:(NSURLRequest *)request dataSource:(WebDataSource *)dataSource formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector;
- (void)_invalidatePendingPolicyDecisionCallingDefaultAction:(BOOL)call;
@@ -138,7 +138,7 @@ typedef enum {
- (void)_loadURL:(NSURL *)URL intoChild:(WebFrame *)childFrame;
- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values;
-- (void)_loadRequest:(WebRequest *)request inFrameNamed:(NSString *)frameName;
+- (void)_loadRequest:(NSURLRequest *)request inFrameNamed:(NSString *)frameName;
- (void)_clientRedirectedTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory;
- (void)_clientRedirectCancelled;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 1711428..c9e3484 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -31,7 +31,7 @@
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebSynchronousResult.h>
@@ -121,7 +121,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
@end
@interface WebFrame (ForwardDecls)
-- (void)_loadRequest:(WebRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formState:(WebFormState *)formState;
+- (void)_loadRequest:(NSURLRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formState:(WebFormState *)formState;
- (NSDictionary *)_actionInformationForLoadType:(WebFrameLoadType)loadType isFormSubmission:(BOOL)isFormSubmission event:(NSEvent *)event originalURL:(NSURL *)URL;
@@ -267,7 +267,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
- (WebHistoryItem *)_createItem
{
WebDataSource *dataSrc = [self dataSource];
- WebRequest *request = [dataSrc request];
+ NSURLRequest *request = [dataSrc request];
NSURL *URL = [request URL];
WebHistoryItem *bfItem;
@@ -1084,7 +1084,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _loadDataSource:newDataSource withLoadType:loadType formState:nil];
}
else {
- WebRequest *request = [[WebRequest alloc] initWithURL:itemURL];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:itemURL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (formData != nil)?YES:NO];
// If this was a repost that failed the page cache, we might try to repost the form.
@@ -1102,11 +1102,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// This trick has a small bug (3123893) where we might find a cache hit, but then
// have the item vanish when we try to use it in the ensuing nav. This should be
// extremely rare, but in that case the user will get an error on the navigation.
- [request setRequestCachePolicy:WebRequestCachePolicyUseCacheDontLoad];
+ [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
WebSynchronousResult *result = [WebResource sendSynchronousRequest:request];
if ([[result response] error]) {
// Not in WF cache
- [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
action = [self _actionInformationForNavigationType:WebNavigationTypeFormResubmitted event:nil originalURL:itemURL];
} else {
// We can use the cache, don't use navType=resubmit
@@ -1115,12 +1115,12 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
} else {
switch (loadType) {
case WebFrameLoadTypeReload:
- [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
break;
case WebFrameLoadTypeBack:
case WebFrameLoadTypeForward:
case WebFrameLoadTypeIndexedBackForward:
- [request setRequestCachePolicy:WebRequestCachePolicyUseCacheElseLoad];
+ [request setCachePolicy:NSURLRequestReturnCacheDataElseLoad];
break;
case WebFrameLoadTypeStandard:
case WebFrameLoadTypeInternal:
@@ -1208,7 +1208,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _recursiveGoToItem:item fromItem:currItem withLoadType:type];
}
-- (void)_loadRequest:(WebRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formState:(WebFormState *)formState
+- (void)_loadRequest:(NSURLRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formState:(WebFormState *)formState
{
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
[newDataSource _setTriggeringAction:action];
@@ -1289,7 +1289,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[_private->listener release];
_private->listener = nil;
- WebRequest *request = _private->policyRequest;
+ NSURLRequest *request = _private->policyRequest;
NSString *frameName = _private->policyFrameName;
id target = _private->policyTarget;
SEL selector = _private->policySelector;
@@ -1315,7 +1315,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[formState release];
}
-- (void)_checkNewWindowPolicyForRequest:(WebRequest *)request action:(NSDictionary *)action frameName:(NSString *)frameName formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector
+- (void)_checkNewWindowPolicyForRequest:(NSURLRequest *)request action:(NSDictionary *)action frameName:(NSString *)frameName formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector
{
WebPolicyDecisionListener *listener = [[WebPolicyDecisionListener alloc]
_initWithTarget:self action:@selector(_continueAfterNewWindowPolicy:)];
@@ -1338,7 +1338,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
-(void)_continueAfterNewWindowPolicy:(WebPolicyAction)policy
{
- WebRequest *request = [[_private->policyRequest retain] autorelease];
+ NSURLRequest *request = [[_private->policyRequest retain] autorelease];
NSString *frameName = [[_private->policyFrameName retain] autorelease];
id target = [[_private->policyTarget retain] autorelease];
SEL selector = _private->policySelector;
@@ -1367,7 +1367,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
-- (void)_checkNavigationPolicyForRequest:(WebRequest *)request dataSource:(WebDataSource *)dataSource formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector
+- (void)_checkNavigationPolicyForRequest:(NSURLRequest *)request dataSource:(WebDataSource *)dataSource formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector
{
NSDictionary *action = [dataSource _triggeringAction];
if (action == nil) {
@@ -1410,7 +1410,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
-(void)_continueAfterNavigationPolicy:(WebPolicyAction)policy
{
- WebRequest *request = [[_private->policyRequest retain] autorelease];
+ NSURLRequest *request = [[_private->policyRequest retain] autorelease];
id target = [[_private->policyTarget retain] autorelease];
SEL selector = _private->policySelector;
WebFormState *formState = [[_private->policyFormState retain] autorelease];
@@ -1441,7 +1441,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[target performSelector:selector withObject:(shouldContinue ? request : nil) withObject:formState];
}
--(void)_continueFragmentScrollAfterNavigationPolicy:(WebRequest *)request formState:(WebFormState *)formState
+-(void)_continueFragmentScrollAfterNavigationPolicy:(NSURLRequest *)request formState:(WebFormState *)formState
{
if (!request) {
return;
@@ -1480,7 +1480,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangedWithinPageForDataSource:dataSrc];
}
-- (void)_addExtraFieldsToRequest:(WebRequest *)request alwaysFromRequest: (BOOL)f
+- (void)_addExtraFieldsToRequest:(NSURLRequest *)request alwaysFromRequest: (BOOL)f
{
[request setUserAgent:[[self webView] userAgentForURL:[request URL]]];
@@ -1496,7 +1496,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
--(void)_continueLoadRequestAfterNewWindowPolicy:(WebRequest *)request frameName:(NSString *)frameName formState:(WebFormState *)formState
+-(void)_continueLoadRequestAfterNewWindowPolicy:(NSURLRequest *)request frameName:(NSString *)frameName formState:(WebFormState *)formState
{
if (!request) {
return;
@@ -1523,11 +1523,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
{
BOOL isFormSubmission = (values != nil);
- WebRequest *request = [[WebRequest alloc] initWithURL:URL];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
[request setReferrer:referrer];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (event != nil || isFormSubmission)];
if (loadType == WebFrameLoadTypeReload) {
- [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
}
// I believe this is never called with LoadSame. If it is, we probably want to set the cache
@@ -1650,9 +1650,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// When posting, use the WebResourceHandleFlagLoadFromOrigin load flag.
// This prevents a potential bug which may cause a page with a form that uses itself
// as an action to be returned from the cache without submitting.
- WebRequest *request = [[WebRequest alloc] initWithURL:URL];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: YES];
- [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
+ [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
[request setRequestMethod:@"POST"];
[request setRequestData:data];
[request setContentType:contentType];
@@ -1749,8 +1749,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return;
}
- WebRequest *request = [[dataSource request] copy];
- [request setRequestCachePolicy:WebRequestCachePolicyUseCacheElseLoad];
+ NSURLRequest *request = [[dataSource request] copy];
+ [request setCachePolicy:NSURLRequestReturnCacheDataElseLoad];
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
[request release];
@@ -1866,7 +1866,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[_private->provisionalDataSource _startLoading];
}
--(void)_continueLoadRequestAfterNavigationPolicy:(WebRequest *)request formState:(WebFormState *)formState
+-(void)_continueLoadRequestAfterNavigationPolicy:(NSURLRequest *)request formState:(WebFormState *)formState
{
if (!request) {
[self _resetBackForwardListToCurrent];
@@ -1955,7 +1955,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return [URLString isEqual:[item URLString]] || [URLString isEqual:[item originalURLString]];
}
-- (void)_loadRequest:(WebRequest *)request inFrameNamed:(NSString *)frameName
+- (void)_loadRequest:(NSURLRequest *)request inFrameNamed:(NSString *)frameName
{
if (frameName == nil) {
[self loadRequest:request];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 54251d0..aa3762e 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -28,7 +28,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
enum {
SpaceKey = 0x0020
@@ -132,7 +132,7 @@ enum {
NSURL *URL = [[sender draggingPasteboard] _web_bestURL];
if (URL) {
- WebRequest *request = [[WebRequest alloc] initWithURL:URL];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
[[[self _controller] mainFrame] loadRequest:request];
[request release];
}
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index e3c719d..2e10269 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -10,7 +10,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRendererFactory.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
@implementation WebImageRepresentation
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index f908d4a..a0a4ef0 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -9,7 +9,7 @@
@class WebDataSource;
@class WebError;
@class WebResource;
- at class WebRequest;
+ at class NSURLRequest;
@class WebResponse;
@protocol WebResourceDelegate;
@@ -19,7 +19,7 @@
@protected
WebDataSource *dataSource;
WebResource *resource;
- WebRequest *request;
+ NSURLRequest *request;
@private
WebView *controller;
WebResponse *response;
@@ -31,10 +31,10 @@
BOOL defersCallbacks;
}
-- (BOOL)loadWithRequest:(WebRequest *)request;
+- (BOOL)loadWithRequest:(NSURLRequest *)request;
// this method exists only to be subclassed, don't call it directly
-- (void)startLoading:(WebRequest *)r;
+- (void)startLoading:(NSURLRequest *)r;
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index b46fee6..29b8b10 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -9,7 +9,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -62,12 +62,12 @@
[super dealloc];
}
-- (void)startLoading:(WebRequest *)r
+- (void)startLoading:(NSURLRequest *)r
{
[resource loadWithDelegate:self];
}
-- (BOOL)loadWithRequest:(WebRequest *)r
+- (BOOL)loadWithRequest:(NSURLRequest *)r
{
ASSERT(resource == nil);
@@ -129,7 +129,7 @@
return downloadDelegate;
}
--(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
+-(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 91ce691..87b337f 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -11,7 +11,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
@@ -91,7 +91,7 @@
[self cancelWithError:[self interruptForPolicyChangeError]];
}
--(void)continueAfterNavigationPolicy:(WebRequest *)_request formState:(WebFormState *)state
+-(void)continueAfterNavigationPolicy:(NSURLRequest *)_request formState:(WebFormState *)state
{
[[dataSource _controller] setDefersCallbacks:NO];
if (!_request) {
@@ -99,7 +99,7 @@
}
}
--(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
+-(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
{
// Note that there are no asserts here as there are for the other callbacks. This is due to the
// fact that this "callback" is sent when starting every load, and the state of callback
@@ -137,7 +137,7 @@
-(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResponse *)r
{
[[dataSource _controller] setDefersCallbacks:NO];
- WebRequest *req = [dataSource request];
+ NSURLRequest *req = [dataSource request];
switch (contentPolicy) {
case WebPolicyUse:
@@ -265,7 +265,7 @@
[self receivedError:error];
}
-- (void)startLoading:(WebRequest *)r
+- (void)startLoading:(NSURLRequest *)r
{
if ([[r URL] _web_shouldLoadAsEmptyDocument]) {
[self resource:resource willSendRequest:r];
@@ -298,7 +298,7 @@
delegate = theDelegate;
}
-- (WebRequest *)resource:(WebResource *)resource willSendRequest:(WebRequest *)request
+- (NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)request
{
ASSERT(delegate);
return [delegate resource:resource willSendRequest:request];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 91ce691..87b337f 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -11,7 +11,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
@@ -91,7 +91,7 @@
[self cancelWithError:[self interruptForPolicyChangeError]];
}
--(void)continueAfterNavigationPolicy:(WebRequest *)_request formState:(WebFormState *)state
+-(void)continueAfterNavigationPolicy:(NSURLRequest *)_request formState:(WebFormState *)state
{
[[dataSource _controller] setDefersCallbacks:NO];
if (!_request) {
@@ -99,7 +99,7 @@
}
}
--(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
+-(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
{
// Note that there are no asserts here as there are for the other callbacks. This is due to the
// fact that this "callback" is sent when starting every load, and the state of callback
@@ -137,7 +137,7 @@
-(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResponse *)r
{
[[dataSource _controller] setDefersCallbacks:NO];
- WebRequest *req = [dataSource request];
+ NSURLRequest *req = [dataSource request];
switch (contentPolicy) {
case WebPolicyUse:
@@ -265,7 +265,7 @@
[self receivedError:error];
}
-- (void)startLoading:(WebRequest *)r
+- (void)startLoading:(NSURLRequest *)r
{
if ([[r URL] _web_shouldLoadAsEmptyDocument]) {
[self resource:resource willSendRequest:r];
@@ -298,7 +298,7 @@
delegate = theDelegate;
}
-- (WebRequest *)resource:(WebResource *)resource willSendRequest:(WebRequest *)request
+- (NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)request
{
ASSERT(delegate);
return [delegate resource:resource willSendRequest:request];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 2c0404e..e0de111 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -12,7 +12,7 @@
@class WebFrame;
@class WebPolicyPrivate;
@class WebResponse;
- at class WebRequest;
+ at class NSURLRequest;
/*!
@@ -117,7 +117,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
on every redirect.
*/
- (void)webView:(WebView *)webView decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebRequest *)request
+ andRequest:(NSURLRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -138,7 +138,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
in its action. This is to avoid possible confusion about the modifiers.
*/
- (void)webView:(WebView *)webView decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebRequest *)request
+ andRequest:(NSURLRequest *)request
newFrameName:(NSString *)frameName
decisionListener:(id<WebPolicyDecisionListener>)listener;
@@ -151,7 +151,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param listener The object to call when the decision is made
*/
- (void)webView:(WebView *)webView decideContentPolicyForMIMEType:(NSString *)type
- andRequest:(WebRequest *)request
+ andRequest:(NSURLRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener;
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 9f362cf..b35e8cc 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -8,7 +8,7 @@
@class WebDataSource;
@class WebPluginError;
@class WebResponse;
- at class WebRequest;
+ at class NSURLRequest;
/*!
@category WebResourceLoadDelegate
@@ -36,7 +36,7 @@
@result An identifier that will be passed back to the implementor for each callback.
The identifier will be retained.
*/
-- webView:(WebView *)sender identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource;
+- webView:(WebView *)sender identifierForInitialRequest: (NSURLRequest *)request fromDataSource: (WebDataSource *)dataSource;
/*!
@method resource:willSendRequest:fromDataSource:
@@ -50,7 +50,7 @@
@result Returns the request, which may be mutated by the implementor, although typically
will be request.
*/
--(WebRequest *)webView:(WebView *)sender resource:identifier willSendRequest: (WebRequest *)request fromDataSource:(WebDataSource *)dataSource;
+-(NSURLRequest *)webView:(WebView *)sender resource:identifier willSendRequest: (NSURLRequest *)request fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveResponse:fromDataSource:
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index badc1e0..c958dc3 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -6,7 +6,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
/*!
@protocol WebOpenPanelResultListener
@@ -50,7 +50,7 @@
@param request The request to load.
@result The WebView for the new window.
*/
-- (WebView *)webView:(WebView *)webView createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView:(WebView *)webView createWindowWithRequest:(NSURLRequest *)request;
/*!
@method showWindow
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 40077d6..4eebf4f 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -455,7 +455,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
{
NSString *URLString = [sender stringValue];
- [[self mainFrame] loadRequest: [WebRequest requestWithURL: [NSURL URLWithString: URLString]]];
+ [[self mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL URLWithString: URLString]]];
}
- (IBAction)goBack:(id)sender
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index a73715c..2fd48f1 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -108,7 +108,7 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
- (WebFrame *)_findFrameNamed: (NSString *)name;
-- (WebView *)_openNewWindowWithRequest:(WebRequest *)request;
+- (WebView *)_openNewWindowWithRequest:(NSURLRequest *)request;
- (NSMenu *)_menuForElement:(NSDictionary *)element;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 67c2d48..d6cd5bb 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -30,7 +30,7 @@
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebResource.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebCore/WebCoreSettings.h>
@@ -248,7 +248,7 @@
{
ASSERT(URL);
- WebRequest *request = [[WebRequest alloc] initWithURL:URL];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
WebDownload *download = [[WebDownload alloc] initWithRequest:request];
[request release];
@@ -307,7 +307,7 @@
return frame;
}
-- (WebView *)_openNewWindowWithRequest:(WebRequest *)request
+- (WebView *)_openNewWindowWithRequest:(NSURLRequest *)request
{
id wd = [self windowOperationsDelegate];
WebView *newWindowController = nil;
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index badc1e0..c958dc3 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -6,7 +6,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/NSURLRequest.h>
/*!
@protocol WebOpenPanelResultListener
@@ -50,7 +50,7 @@
@param request The request to load.
@result The WebView for the new window.
*/
-- (WebView *)webView:(WebView *)webView createWindowWithRequest:(WebRequest *)request;
+- (WebView *)webView:(WebView *)webView createWindowWithRequest:(NSURLRequest *)request;
/*!
@method showWindow
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list