[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:25:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0322a37d92385349a914650d6e83d17b57bda13a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 20 16:40:04 2003 +0000
Tools:
Reviewed by David
Modified to use new WebFoundation API.
* WebDiskCacheInspector/Controller.m:
(-[Controller setCachePath:]):
(-[Controller loadFileList:]):
(-[Controller tableView:objectValueForTableColumn:row:]):
(-[Controller setCacheObject:]):
* WebDiskCacheInspector/WebDiskCacheInspector.pbproj/project.pbxproj:
Tests:
Reviewed by David
Modified to use new WebFoundation API. Most of the changes were in
class names and method names only.
An exception is SnippetEditor/DataResourceRequest.m. This class
has been updated to use the new API for WebProtocol implementors.
* CookieManager/wkcookiemanager-test.m:
(main):
* DumpBackForward/main.m:
(dumpBackForward):
(-[CheapWindowOpsDelegate createWindowWithRequest:]):
* DumpRenderTree/main.m:
(dumpRenderTree):
* SnippetEditor/DataResourceRequest.h:
* SnippetEditor/DataResourceRequest.m:
(+[DataProtocolHandler load]):
(+[DataProtocolHandler canonicalURLForURL:]):
(-[DataProtocolHandler startLoadingWithCacheObject:]):
(-[DataProtocolHandler stopLoading]):
* SnippetEditor/SnippetController.m:
(-[SnippetController updateFromURL:]):
* WebFoundation-CacheLoader/NeverExpiresTest.m:
(-[NeverExpiresTest testNeverExpires]):
WebFoundation:
Reviewed by David.
The big WebFoundation API change.
This check in delivers a nice new interface for WebProtocol developers,
simplifies the interaction between protocols and WebResource objects,
cleans up reponse creation and response callback delivery, and includes
numerous other small changes and improvements that helped to fix on the
final API.
There were also many name changes to files, the big changes can be
described as follows:
* "ProtocolHandler" changes to "Protocol"
* Usages of "Resource" removed from request and reponse classes.
* "WebResourceHandle" and its variants now use just "WebResource".
These bugs gets fixed as aresult of this check in.
Radar 3081798 (MASTER: WebFoundation API/SPI complete)
Radar 3078996 (error codes should be named in a way that makes them unlikely to
be used in the wrong domain)
Radar 3151249 (<WebFoundation/WebResourceLoad.h> is missing)
Radar 3163688 (API on WebResourceLoad needs to be sanitized for public consumption)
Radar 3164090 (Fix on final SPI for WebFoundation protocol handler developers)
Radar 3164091 (Consider merging WebResourceLoad and WebResourceHandle classes)
Note that since I touched just about every file in the framework, I did not call
things out individually.
WebKit:
Reviewed by David
Modified to use new WebFoundation API. Though there seem to be
many changes, they are all "uninteresting" in that the changes
only moved code to use new method and class names.
* Downloads.subproj/WebDownload.h:
* Downloads.subproj/WebDownload.m:
(-[WebDownload initWithRequest:delegate:]):
(-[WebDownload _initWithLoadingHandle:request:response:delegate:]):
(-[WebDownload createFileIfNecessary]):
* Downloads.subproj/WebDownloadPrivate.h:
* Misc.subproj/WebIconLoader.h:
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading]):
(-[WebIconLoader resourceDidFinishLoading:]):
(-[WebIconLoader resource:willSendRequest:]):
(-[WebIconLoader resource:didReceiveResponse:]):
(-[WebIconLoader resource:didReceiveData:]):
(-[WebIconLoader resource:didFailLoadingWithError:]):
* Misc.subproj/WebResourceResponseExtras.h:
* Misc.subproj/WebResourceResponseExtras.m:
(-[WebHTTPResponse suggestedFilenameForSaving]):
* Plugins.subproj/WebBaseNetscapePluginStream.h:
* Plugins.subproj/WebBaseNetscapePluginStream.m:
(-[WebBaseNetscapePluginStream setResponse:]):
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView sendEvent:]):
(-[WebBaseNetscapePluginView requestWithURLCString:]):
(-[WebBaseNetscapePluginView loadPluginRequest:]):
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
(-[WebBaseNetscapePluginView getURLNotify:target:notifyData:]):
(-[WebBaseNetscapePluginView getURL:target:]):
(-[WebBaseNetscapePluginView postURLNotify:target:len:buf:file:notifyData:]):
(-[WebPluginRequest initWithRequest:frame:notifyData:]):
(-[WebPluginRequest request]):
* Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
(-[WebNetscapePluginEmbeddedView viewDidMoveToWindow]):
* Plugins.subproj/WebNetscapePluginRepresentation.m:
(-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
* Plugins.subproj/WebNetscapePluginStream.h:
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
(-[WebNetscapePluginStream resource:didReceiveResponse:]):
(-[WebNetscapePluginStream resource:didReceiveData:]):
(-[WebNetscapePluginStream resourceDidFinishLoading:]):
(-[WebNetscapePluginStream resource:didFailLoadingWithError:]):
* Plugins.subproj/WebPluginController.m:
(-[WebPluginController showURL:inFrame:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge createWindowWithURL:frameName:]):
(-[WebBridge objectLoadedFromCacheWithURL:response:size:]):
(-[WebBridge defersLoading]):
(-[WebBridge setDefersLoading:]):
(-[WebBridge loadEmptyDocumentSynchronously]):
* WebCoreSupport.subproj/WebCookieAdapter.m:
(-[WebCookieAdapter cookiesForURL:]):
(-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
* WebCoreSupport.subproj/WebSubresourceClient.h:
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
(-[WebSubresourceClient resource:willSendRequest:]):
(-[WebSubresourceClient resource:didReceiveResponse:]):
(-[WebSubresourceClient resource:didReceiveData:]):
(-[WebSubresourceClient resourceDidFinishLoading:]):
(-[WebSubresourceClient resource:didFailLoadingWithError:]):
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate startLoading:]):
(-[WebBaseResourceHandleDelegate loadWithRequest:]):
(-[WebBaseResourceHandleDelegate setDefersCallbacks:]):
(-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
(-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
(-[WebBaseResourceHandleDelegate resource:didReceiveData:]):
(-[WebBaseResourceHandleDelegate resourceDidFinishLoading:]):
(-[WebBaseResourceHandleDelegate resource:didFailLoadingWithError:]):
(-[WebBaseResourceHandleDelegate cancelledError]):
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(-[WebResourceLoadDelegate identifierForInitialRequest:fromDataSource:]):
(-[WebResourceLoadDelegate resource:willSendRequest:fromDataSource:]):
(-[WebResourceLoadDelegate resource:didReceiveResponse:fromDataSource:]):
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebController _downloadURL:toDirectory:]):
(-[WebController defersCallbacks]):
(-[WebController setDefersCallbacks:]):
(-[WebController _openNewWindowWithRequest:behind:]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource initWithURL:]):
(-[WebDataSource initWithRequest:]):
(-[WebDataSource initialRequest]):
(-[WebDataSource request]):
(-[WebDataSource response]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _addSubresourceClient:]):
(-[WebDataSource _stopLoading]):
(-[WebDataSource _setURL:]):
(-[WebDataSource _setRequest:]):
(-[WebDataSource _setResponse:]):
(-[WebDataSource _commitIfReady:]):
(-[WebDataSource _defersCallbacksChanged]):
(-[WebDataSource _originalRequest]):
(-[WebDataSource _lastCheckedRequest]):
(-[WebDataSource _setLastCheckedRequest:]):
(-[WebDataSource _addResponse:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate savePathForResponse:andRequest:]):
(-[WebDefaultPolicyDelegate decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
(-[WebFrame loadRequest:]):
(-[WebFrame reload]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _createItem]):
(-[WebFrame _opened]):
(-[WebFrame _loadItem:fromItem:withLoadType:]):
(-[WebFrame _loadRequest:triggeringAction:loadType:formValues:]):
(-[WebFrame _invalidatePendingPolicyDecisionCallingDefaultAction:]):
(-[WebFrame _checkNavigationPolicyForRequest:dataSource:formValues:andCall:withSelector:]):
(-[WebFrame _continueAfterNavigationPolicy:]):
(-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formValues:]):
(-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
(-[WebFrame _loadURL:loadType:triggeringEvent:formValues:]):
(-[WebFrame _postWithURL:data:contentType:triggeringEvent:formValues:]):
(-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
(-[WebFrame _continueLoadRequestAfterNavigationPolicy:formValues:]):
(-[WebFrame _downloadRequest:toDirectory:]):
* WebView.subproj/WebHTMLRepresentation.m:
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterNavigationPolicy:formValues:]):
(-[WebMainResourceClient resource:willSendRequest:]):
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
(-[WebMainResourceClient checkContentPolicyForResponse:andCallSelector:]):
(-[WebMainResourceClient resource:didReceiveResponse:]):
(-[WebMainResourceClient resource:didReceiveData:]):
(-[WebMainResourceClient resourceDidFinishLoading:]):
(-[WebMainResourceClient resource:didFailLoadingWithError:]):
(-[WebMainResourceClient startLoading:]):
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebTextRepresentation.m:
* WebView.subproj/WebTextView.m:
* WebView.subproj/WebView.m:
(-[WebView concludeDragOperation:]):
* WebView.subproj/WebViewPrivate.m:
* WebView.subproj/WebWindowOperationsDelegate.h:
WebBrowser:
Reviewed by David
Modified to use new WebFoundation API. Though there seem to be
many changes, they are all "uninteresting" in that the changes
only moved code to use new method and class names.
* BrowserDocument.h:
* BrowserDocument.m:
(-[BrowserDocument initWithContentsOfRequest:]):
(-[BrowserDocument initWithContentsOfURL:ofType:]):
(-[BrowserDocument goToRequest:]):
* BrowserDocumentController.h:
* BrowserDocumentController.m:
(-[BrowserDocumentController openDocumentWithContentsOfRequest:behind:display:]):
(-[BrowserDocumentController openDocumentWithContentsOfURL:display:]):
(-[BrowserDocumentController _goToEachRequest:windowPolicy:]):
(-[BrowserDocumentController openDocument:]):
(-[BrowserDocumentController goToURL:windowPolicy:]):
(-[BrowserDocumentController goToRequest:windowPolicy:]):
* BrowserWebController.h:
* BrowserWebController.m:
(-[BrowserWebController initWithDocument:request:]):
(-[BrowserWebController createWindowWithRequest:]):
(-[BrowserWebController contentPolicyForMIMEType:andRequest:inFrame:]):
(-[BrowserWebController savePathForResponse:andRequest:]):
(-[BrowserWebController decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
(-[BrowserWebController goToRequest:]):
(-[BrowserWebController goToURL:withFallbackURLs:]):
* BugReportController.h:
* BugReportController.m:
(-[BugReportController sendBugReportToAppleWithScreenShot:source:]):
(-[BugReportController resource:willSendRequest:]):
(-[BugReportController resource:didReceiveResponse:]):
(-[BugReportController resource:didReceiveData:]):
(-[BugReportController resourceDidFinishLoading:]):
(-[BugReportController resource:didFailLoadingWithError:]):
* ContextMenuHandler.m:
(-[ContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
* Debug/DebugUtilities.m:
(initProtocolHandlers):
(-[BrowserDocument unregisterAllProtocolHandlers]):
(-[BrowserDocument reregisterAllProtocolHandlers]):
(-[BrowserDocument toggleAboutProtocolHandler:]):
(-[BrowserDocument toggleFileProtocolHandler:]):
(-[BrowserDocument toggleCFNetworkHTTPProtocolHandler:]):
(-[BrowserDocument toggleSimpleHTTPProtocolHandler:]):
* Debug/SnippetController.m:
(-[SnippetController load]):
* DownloadMonitor.m:
(-[DownloadMonitor identifierForInitialRequest:fromDataSource:]):
(-[DownloadMonitor resource:willSendRequest:fromDataSource:]):
(-[DownloadMonitor resource:didReceiveResponse:fromDataSource:]):
* DownloadProgressEntry.h:
* DownloadProgressEntry.m:
(-[DownloadProgressEntry _setRequest:]):
(+[DownloadProgressEntry entryWithDictionary:]):
(-[DownloadProgressEntry stop]):
* FrameProgressEntry.m:
(-[FrameProgressEntry stage]):
* HTMLSourceDocument.m:
* LoadProgressMonitor.h:
* LoadProgressMonitor.m:
(-[LoadProgressMonitor _createProgressEntryWithRequest:dataSource:]):
(-[LoadProgressMonitor identifierForInitialRequest:fromDataSource:]):
(-[LoadProgressMonitor resource:willSendRequest:fromDataSource:]):
(-[LoadProgressMonitor resource:didReceiveResponse:fromDataSource:]):
* LocationChangeError.m:
(-[LocationChangeHandler specializedTitleForError:]):
(-[LocationChangeHandler specializedMessageForError:]):
(-[LocationChangeHandler displayLocationChangeError:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler unknownRootSheetDidEnd:returnCode:contextInfo:]):
(-[LocationChangeHandler locationChangeDone:forDataSource:]):
* ResourceProgressEntry.m:
(-[ResourceProgressEntry stage]):
(-[ResourceProgressEntry statusString]):
* Test/PageLoadTestRunner.m:
(-[PageLoadTestRunner startTest]):
(-[PageLoadTestRunner stop]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3675 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2d7ba41..3dd0fc9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,162 @@
+2003-02-20 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by David
+
+ Modified to use new WebFoundation API. Though there seem to be
+ many changes, they are all "uninteresting" in that the changes
+ only moved code to use new method and class names.
+
+ * Downloads.subproj/WebDownload.h:
+ * Downloads.subproj/WebDownload.m:
+ (-[WebDownload initWithRequest:delegate:]):
+ (-[WebDownload _initWithLoadingHandle:request:response:delegate:]):
+ (-[WebDownload createFileIfNecessary]):
+ * Downloads.subproj/WebDownloadPrivate.h:
+ * Misc.subproj/WebIconLoader.h:
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading]):
+ (-[WebIconLoader resourceDidFinishLoading:]):
+ (-[WebIconLoader resource:willSendRequest:]):
+ (-[WebIconLoader resource:didReceiveResponse:]):
+ (-[WebIconLoader resource:didReceiveData:]):
+ (-[WebIconLoader resource:didFailLoadingWithError:]):
+ * Misc.subproj/WebResourceResponseExtras.h:
+ * Misc.subproj/WebResourceResponseExtras.m:
+ (-[WebHTTPResponse suggestedFilenameForSaving]):
+ * Plugins.subproj/WebBaseNetscapePluginStream.h:
+ * Plugins.subproj/WebBaseNetscapePluginStream.m:
+ (-[WebBaseNetscapePluginStream setResponse:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView sendEvent:]):
+ (-[WebBaseNetscapePluginView requestWithURLCString:]):
+ (-[WebBaseNetscapePluginView loadPluginRequest:]):
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ (-[WebBaseNetscapePluginView getURLNotify:target:notifyData:]):
+ (-[WebBaseNetscapePluginView getURL:target:]):
+ (-[WebBaseNetscapePluginView postURLNotify:target:len:buf:file:notifyData:]):
+ (-[WebPluginRequest initWithRequest:frame:notifyData:]):
+ (-[WebPluginRequest request]):
+ * Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ (-[WebNetscapePluginEmbeddedView viewDidMoveToWindow]):
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ (-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+ (-[WebNetscapePluginStream resource:didReceiveResponse:]):
+ (-[WebNetscapePluginStream resource:didReceiveData:]):
+ (-[WebNetscapePluginStream resourceDidFinishLoading:]):
+ (-[WebNetscapePluginStream resource:didFailLoadingWithError:]):
+ * Plugins.subproj/WebPluginController.m:
+ (-[WebPluginController showURL:inFrame:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge createWindowWithURL:frameName:]):
+ (-[WebBridge objectLoadedFromCacheWithURL:response:size:]):
+ (-[WebBridge defersLoading]):
+ (-[WebBridge setDefersLoading:]):
+ (-[WebBridge loadEmptyDocumentSynchronously]):
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ (-[WebCookieAdapter cookiesForURL:]):
+ (-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ (-[WebSubresourceClient resource:willSendRequest:]):
+ (-[WebSubresourceClient resource:didReceiveResponse:]):
+ (-[WebSubresourceClient resource:didReceiveData:]):
+ (-[WebSubresourceClient resourceDidFinishLoading:]):
+ (-[WebSubresourceClient resource:didFailLoadingWithError:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate startLoading:]):
+ (-[WebBaseResourceHandleDelegate loadWithRequest:]):
+ (-[WebBaseResourceHandleDelegate setDefersCallbacks:]):
+ (-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
+ (-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
+ (-[WebBaseResourceHandleDelegate resource:didReceiveData:]):
+ (-[WebBaseResourceHandleDelegate resourceDidFinishLoading:]):
+ (-[WebBaseResourceHandleDelegate resource:didFailLoadingWithError:]):
+ (-[WebBaseResourceHandleDelegate cancelledError]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebResourceLoadDelegate identifierForInitialRequest:fromDataSource:]):
+ (-[WebResourceLoadDelegate resource:willSendRequest:fromDataSource:]):
+ (-[WebResourceLoadDelegate resource:didReceiveResponse:fromDataSource:]):
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _downloadURL:toDirectory:]):
+ (-[WebController defersCallbacks]):
+ (-[WebController setDefersCallbacks:]):
+ (-[WebController _openNewWindowWithRequest:behind:]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithURL:]):
+ (-[WebDataSource initWithRequest:]):
+ (-[WebDataSource initialRequest]):
+ (-[WebDataSource request]):
+ (-[WebDataSource response]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _addSubresourceClient:]):
+ (-[WebDataSource _stopLoading]):
+ (-[WebDataSource _setURL:]):
+ (-[WebDataSource _setRequest:]):
+ (-[WebDataSource _setResponse:]):
+ (-[WebDataSource _commitIfReady:]):
+ (-[WebDataSource _defersCallbacksChanged]):
+ (-[WebDataSource _originalRequest]):
+ (-[WebDataSource _lastCheckedRequest]):
+ (-[WebDataSource _setLastCheckedRequest:]):
+ (-[WebDataSource _addResponse:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate savePathForResponse:andRequest:]):
+ (-[WebDefaultPolicyDelegate decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame loadRequest:]):
+ (-[WebFrame reload]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _createItem]):
+ (-[WebFrame _opened]):
+ (-[WebFrame _loadItem:fromItem:withLoadType:]):
+ (-[WebFrame _loadRequest:triggeringAction:loadType:formValues:]):
+ (-[WebFrame _invalidatePendingPolicyDecisionCallingDefaultAction:]):
+ (-[WebFrame _checkNavigationPolicyForRequest:dataSource:formValues:andCall:withSelector:]):
+ (-[WebFrame _continueAfterNavigationPolicy:]):
+ (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formValues:]):
+ (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
+ (-[WebFrame _loadURL:loadType:triggeringEvent:formValues:]):
+ (-[WebFrame _postWithURL:data:contentType:triggeringEvent:formValues:]):
+ (-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
+ (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formValues:]):
+ (-[WebFrame _downloadRequest:toDirectory:]):
+ * WebView.subproj/WebHTMLRepresentation.m:
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterNavigationPolicy:formValues:]):
+ (-[WebMainResourceClient resource:willSendRequest:]):
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ (-[WebMainResourceClient checkContentPolicyForResponse:andCallSelector:]):
+ (-[WebMainResourceClient resource:didReceiveResponse:]):
+ (-[WebMainResourceClient resource:didReceiveData:]):
+ (-[WebMainResourceClient resourceDidFinishLoading:]):
+ (-[WebMainResourceClient resource:didFailLoadingWithError:]):
+ (-[WebMainResourceClient startLoading:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebTextRepresentation.m:
+ * WebView.subproj/WebTextView.m:
+ * WebView.subproj/WebView.m:
+ (-[WebView concludeDragOperation:]):
+ * WebView.subproj/WebViewPrivate.m:
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+
2003-02-18 Maciej Stachowiak <mjs at ap0101m-dhcp138.apple.com>
Reviewed by Chris.
diff --git a/WebKit/Downloads.subproj/WebDownload.h b/WebKit/Downloads.subproj/WebDownload.h
index 20bc24d..8188acc 100644
--- a/WebKit/Downloads.subproj/WebDownload.h
+++ b/WebKit/Downloads.subproj/WebDownload.h
@@ -10,8 +10,8 @@
@class WebDownload;
@class WebDownloadPrivate;
@class WebError;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebRequest;
+ at class WebResponse;
/*!
@protocol WebDownloadDecisionListener
@@ -53,7 +53,7 @@
@param request The request that will be used to continue loading.
@result The request to be used; either the request parameter or a replacement.
*/
-- (WebResourceRequest *)download:(WebDownload *)download willSendRequest:(WebResourceRequest *)request;
+- (WebRequest *)download:(WebDownload *)download willSendRequest:(WebRequest *)request;
/*!
@method download:didReceiveResponse:
@@ -61,7 +61,7 @@
@param download The download that now has a WebResourceResponse available for inspection.
@param response The WebResourceResponse object for the given download.
*/
-- (void)download:(WebDownload *)download didReceiveResponse:(WebResourceResponse *)response;
+- (void)download:(WebDownload *)download didReceiveResponse:(WebResponse *)response;
/*!
@method download:decidePathWithListener:suggestedFilename:
@@ -124,7 +124,7 @@
@param request The request to download. Must not be nil.
@param delegate The delegate of the download. Must not be nil.
*/
-- initWithRequest:(WebResourceRequest *)request delegate:(id <WebDownloadDelegate>)delegate;
+- initWithRequest:(WebRequest *)request delegate:(id <WebDownloadDelegate>)delegate;
/*!
@method cancel
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 824a940..5a09c04 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -20,8 +20,8 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
typedef struct WebFSForkIOParam
{
@@ -93,7 +93,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
@implementation WebDownload
-- initWithRequest:(WebResourceRequest *)request delegate:(id <WebDownloadDelegate>)delegate
+- initWithRequest:(WebRequest *)request delegate:(id <WebDownloadDelegate>)delegate
{
[super init];
// FIXME: Implement.
@@ -116,9 +116,9 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
@implementation WebDownload (WebPrivate)
-- _initWithLoadingHandle:(WebResourceHandle *)handle
- request:(WebResourceRequest *)request
- response:(WebResourceRequest *)response
+- _initWithLoadingHandle:(WebResource *)handle
+ request:(WebRequest *)request
+ response:(WebRequest *)response
delegate:(id <WebDownloadDelegate>)delegate
{
[super init];
@@ -303,7 +303,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
// FIXME: This assumes that if we get any file attributes, they will include the creation
// and modification date, which is not necessarily true.
if (!fileAttributes) {
- WebResourceResponse *response = [_private->dataSource response];
+ WebResponse *response = [_private->dataSource response];
fileAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
[response createdDate], NSFileCreationDate,
[response lastModifiedDate], NSFileModificationDate, nil];
diff --git a/WebKit/Downloads.subproj/WebDownloadPrivate.h b/WebKit/Downloads.subproj/WebDownloadPrivate.h
index d1ffe7d..d8099d8 100644
--- a/WebKit/Downloads.subproj/WebDownloadPrivate.h
+++ b/WebKit/Downloads.subproj/WebDownloadPrivate.h
@@ -8,12 +8,12 @@
#import <WebKit/WebDownload.h>
@class WebDataSource;
- at class WebResourceHandle;
+ at class WebResource;
@interface WebDownload (WebPrivate)
-- _initWithLoadingHandle:(WebResourceHandle *)handle
- request:(WebResourceRequest *)request
- response:(WebResourceRequest *)response
+- _initWithLoadingHandle:(WebResource *)handle
+ request:(WebRequest *)request
+ response:(WebRequest *)response
delegate:(id <WebDownloadDelegate>)delegate;
// FIXME: Remove many of the following methods.
- initWithDataSource:(WebDataSource *)dSource;
diff --git a/WebKit/Misc.subproj/WebDatabase.h b/WebKit/Misc.subproj/WebDatabase.h
index 4a88b04..9c69995 100644
--- a/WebKit/Misc.subproj/WebDatabase.h
+++ b/WebKit/Misc.subproj/WebDatabase.h
@@ -1,5 +1,5 @@
/* WebDatabase.h
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright 2002-2003, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
diff --git a/WebKit/Misc.subproj/WebDatabase.m b/WebKit/Misc.subproj/WebDatabase.m
index 4a017b2..62a60bc 100644
--- a/WebKit/Misc.subproj/WebDatabase.m
+++ b/WebKit/Misc.subproj/WebDatabase.m
@@ -1,5 +1,5 @@
/* WebDatabase.m
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright 2002-2003, Apple, Inc. All rights reserved.
*/
#import <Foundation/NSPrivateDecls.h>
diff --git a/WebKit/Misc.subproj/WebFileDatabase.h b/WebKit/Misc.subproj/WebFileDatabase.h
index ea99fbd..4f253e3 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.h
+++ b/WebKit/Misc.subproj/WebFileDatabase.h
@@ -1,5 +1,5 @@
/* WebFileDatabase.h
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright 2002-2003, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 0eb246d..95a23f1 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -1,5 +1,5 @@
/* WebFileDatabase.m
- Copyright 2002, Apple, Inc. All rights reserved.
+ Copyright 2002-2003, Apple, Inc. All rights reserved.
*/
#import "WebFileDatabase.h"
diff --git a/WebKit/Misc.subproj/WebIconLoader.h b/WebKit/Misc.subproj/WebIconLoader.h
index 8efe799..909d8be 100644
--- a/WebKit/Misc.subproj/WebIconLoader.h
+++ b/WebKit/Misc.subproj/WebIconLoader.h
@@ -8,12 +8,12 @@
#import <Cocoa/Cocoa.h>
@class WebIconLoaderPrivate;
- at protocol WebResourceHandleDelegate;
+ at protocol WebResourceDelegate;
/*!
@class WebIconLoader
*/
- at interface WebIconLoader : NSObject <WebResourceHandleDelegate>
+ at interface WebIconLoader : NSObject <WebResourceDelegate>
{
WebIconLoaderPrivate *_private;
}
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 14238c3..21fa8ab 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -12,16 +12,16 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
#define WebIconLoaderWeeksWorthOfSeconds (60 * 60 * 24 * 7)
@interface WebIconLoaderPrivate : NSObject
{
@public
- WebResourceHandle *handle;
+ WebResource *handle;
id delegate;
NSURL *URL;
NSMutableData *resourceData;
@@ -84,9 +84,9 @@
return;
}
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:_private->URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:_private->URL];
[request setPageNotFoundCacheLifetime:WebIconLoaderWeeksWorthOfSeconds];
- _private->handle = [[WebResourceHandle alloc] initWithRequest:request];
+ _private->handle = [[WebResource alloc] initWithRequest:request];
[_private->handle loadWithDelegate:self];
[request release];
}
@@ -98,7 +98,7 @@
_private->handle = nil;
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)sender
+- (void)resourceDidFinishLoading:(WebResource *)sender
{
NSImage *icon = [[NSImage alloc] initWithData:_private->resourceData];
if (icon) {
@@ -108,22 +108,22 @@
}
}
--(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
+-(WebRequest *)resource:(WebResource *)resource willSendRequest:(WebRequest *)request
{
return request;
}
--(void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
+-(void)resource:(WebResource *)resource didReceiveResponse:(WebResponse *)theResponse
{
// no-op
}
-- (void)handle:(WebResourceHandle *)sender didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)sender didReceiveData:(NSData *)data
{
[_private->resourceData appendData:data];
}
-- (void)handle:(WebResourceHandle *)sender didFailLoadingWithError:(WebError *)result
+- (void)resource:(WebResource *)sender didFailLoadingWithError:(WebError *)result
{
}
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.h b/WebKit/Misc.subproj/WebNSURLResponseExtras.h
index e72435b..a634da6 100644
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLResponseExtras.h
@@ -5,9 +5,9 @@
Public header file.
*/
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
- at interface WebResourceResponse (WebResourceResponseExtras)
+ at interface WebResponse (WebResourceResponseExtras)
/*!
@method suggestedFilenameForSaving
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.m b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
index e4e8556..ba6ec01 100644
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
@@ -10,7 +10,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebHTTPResourceResponse.h>
+#import <WebFoundation/WebHTTPResponse.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebNSStringExtras.h>
@@ -18,7 +18,7 @@
- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType;
@end
- at implementation WebResourceResponse (WebResourceResponseExtras)
+ at implementation WebResponse (WebResourceResponseExtras)
- (NSString *)suggestedFilenameForSaving
{
@@ -30,14 +30,14 @@
@end
- at implementation WebHTTPResourceResponse (WebResourceResponseExtras)
+ at implementation WebHTTPResponse (WebResourceResponseExtras)
- (NSString *)suggestedFilenameForSaving
{
NSString *filename = nil;
// Use the content disposition of the filename if present.
- NSString *contentDispositionHeader = [[self headers] objectForKey:@"Content-Disposition"];
+ NSString *contentDispositionHeader = [[self header] objectForKey:@"Content-Disposition"];
filename = [contentDispositionHeader _web_fileNameFromContentDispositionHeader];
filename = [filename _web_filenameByFixingIllegalCharacters];
diff --git a/WebKit/Misc.subproj/WebResourceResponseExtras.h b/WebKit/Misc.subproj/WebResourceResponseExtras.h
index e72435b..a634da6 100644
--- a/WebKit/Misc.subproj/WebResourceResponseExtras.h
+++ b/WebKit/Misc.subproj/WebResourceResponseExtras.h
@@ -5,9 +5,9 @@
Public header file.
*/
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
- at interface WebResourceResponse (WebResourceResponseExtras)
+ at interface WebResponse (WebResourceResponseExtras)
/*!
@method suggestedFilenameForSaving
diff --git a/WebKit/Misc.subproj/WebResourceResponseExtras.m b/WebKit/Misc.subproj/WebResourceResponseExtras.m
index e4e8556..ba6ec01 100644
--- a/WebKit/Misc.subproj/WebResourceResponseExtras.m
+++ b/WebKit/Misc.subproj/WebResourceResponseExtras.m
@@ -10,7 +10,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebHTTPResourceResponse.h>
+#import <WebFoundation/WebHTTPResponse.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebNSStringExtras.h>
@@ -18,7 +18,7 @@
- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType;
@end
- at implementation WebResourceResponse (WebResourceResponseExtras)
+ at implementation WebResponse (WebResourceResponseExtras)
- (NSString *)suggestedFilenameForSaving
{
@@ -30,14 +30,14 @@
@end
- at implementation WebHTTPResourceResponse (WebResourceResponseExtras)
+ at implementation WebHTTPResponse (WebResourceResponseExtras)
- (NSString *)suggestedFilenameForSaving
{
NSString *filename = nil;
// Use the content disposition of the filename if present.
- NSString *contentDispositionHeader = [[self headers] objectForKey:@"Content-Disposition"];
+ NSString *contentDispositionHeader = [[self header] objectForKey:@"Content-Disposition"];
filename = [contentDispositionHeader _web_fileNameFromContentDispositionHeader];
filename = [filename _web_filenameByFixingIllegalCharacters];
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
index 920795f..4fd8e55 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 WebResourceResponse;
+ at class WebResponse;
@interface WebBaseNetscapePluginStream : WebBaseResourceHandleDelegate
{
@@ -31,7 +31,7 @@
}
- (void)setPluginPointer:(NPP)pluginPointer;
-- (void)setResponse:(WebResourceResponse *)theReponse;
+- (void)setResponse:(WebResponse *)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 b4a49ca..888817a 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -46,7 +46,7 @@
NPP_URLNotify = [plugin NPP_URLNotify];
}
-- (void)setResponse:(WebResourceResponse *)r
+- (void)setResponse:(WebResponse *)r
{
if(![plugin isLoaded]){
return;
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 02c3f68..3d3d2d2 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -20,7 +20,7 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -48,14 +48,14 @@ typedef struct {
@interface WebPluginRequest : NSObject
{
- WebResourceRequest *_request;
+ WebRequest *_request;
WebFrame *_frame;
void *_notifyData;
}
-- (id)initWithRequest:(WebResourceRequest *)request frame:(WebFrame *)frame notifyData:(void *)notifyData;
+- (id)initWithRequest:(WebRequest *)request frame:(WebFrame *)frame notifyData:(void *)notifyData;
-- (WebResourceRequest *)request;
+- (WebRequest *)request;
- (WebFrame *)webFrame;
- (void *)notifyData;
@@ -279,9 +279,9 @@ typedef struct {
return NO;
}
- BOOL defers = [[self controller] _defersCallbacks];
+ BOOL defers = [[self controller] defersCallbacks];
if (!defers) {
- [[self controller] _setDefersCallbacks:YES];
+ [[self controller] setDefersCallbacks:YES];
}
PortState portState = [self saveAndSetPortStateForUpdate:event->what == updateEvt];
@@ -302,7 +302,7 @@ typedef struct {
[self restorePortState:portState];
if (!defers) {
- [[self controller] _setDefersCallbacks:NO];
+ [[self controller] setDefersCallbacks:NO];
}
return acceptedEvent;
@@ -993,7 +993,7 @@ typedef struct {
@implementation WebBaseNetscapePluginView (WebNPPCallbacks)
-- (WebResourceRequest *)requestWithURLCString:(const char *)URLCString
+- (WebRequest *)requestWithURLCString:(const char *)URLCString
{
if (!URLCString) {
return nil;
@@ -1007,12 +1007,12 @@ typedef struct {
return nil;
}
- return [WebResourceRequest requestWithURL:URL];
+ return [WebRequest requestWithURL:URL];
}
- (void)loadPluginRequest:(WebPluginRequest *)pluginRequest
{
- WebResourceRequest *request = [pluginRequest request];
+ WebRequest *request = [pluginRequest request];
WebFrame *frame = [pluginRequest webFrame];
void *notifyData = [pluginRequest notifyData];
@@ -1046,7 +1046,7 @@ typedef struct {
}
}
-- (NPError)loadRequest:(WebResourceRequest *)request inTarget:(const char *)cTarget withNotifyData:(void *)notifyData
+- (NPError)loadRequest:(WebRequest *)request inTarget:(const char *)cTarget withNotifyData:(void *)notifyData
{
if (![request URL]) {
return NPERR_INVALID_URL;
@@ -1081,7 +1081,7 @@ typedef struct {
{
LOG(Plugins, "NPN_GetURLNotify: %s target: %s", URLCString, cTarget);
- WebResourceRequest *request = [self requestWithURLCString:URLCString];
+ WebRequest *request = [self requestWithURLCString:URLCString];
return [self loadRequest:request inTarget:cTarget withNotifyData:notifyData];
}
@@ -1089,7 +1089,7 @@ typedef struct {
{
LOG(Plugins, "NPN_GetURL: %s target: %s", URLCString, cTarget);
- WebResourceRequest *request = [self requestWithURLCString:URLCString];
+ WebRequest *request = [self requestWithURLCString:URLCString];
return [self loadRequest:request inTarget:cTarget withNotifyData:NULL];
}
@@ -1131,9 +1131,9 @@ typedef struct {
return NPERR_INVALID_PARAM;
}
- WebResourceRequest *request = [self requestWithURLCString:URLCString];
- [request setMethod:@"POST"];
- [request setData:postData];
+ WebRequest *request = [self requestWithURLCString:URLCString];
+ [request setRequestMethod:@"POST"];
+ [request setRequestData:postData];
return [self loadRequest:request inTarget:cTarget withNotifyData:notifyData];
}
@@ -1215,7 +1215,7 @@ typedef struct {
@implementation WebPluginRequest
-- (id)initWithRequest:(WebResourceRequest *)request frame:(WebFrame *)frame notifyData:(void *)notifyData
+- (id)initWithRequest:(WebRequest *)request frame:(WebFrame *)frame notifyData:(void *)notifyData
{
[super init];
_request = [request retain];
@@ -1231,7 +1231,7 @@ typedef struct {
[super dealloc];
}
-- (WebResourceRequest *)request
+- (WebRequest *)request
{
return _request;
}
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
index f2c5674..90771f6 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
@@ -5,11 +5,11 @@
#import <WebBaseNetscapePluginView.h>
- at class WebResourceRequest;
+ at class WebRequest;
@interface WebBaseNetscapePluginView (WebNPPCallbacks)
-- (NPError)loadRequest:(WebResourceRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData;
+- (NPError)loadRequest:(WebRequest *)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/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index a6ec0e1..970b0e1 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -17,7 +17,7 @@
#import <WebKit/WebView.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
@implementation WebNetscapePluginDocumentView
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index 6a1f7c2..e817145 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -12,7 +12,7 @@
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebView.h>
-#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebRequest.h>
@implementation WebNetscapePluginEmbeddedView
@@ -53,7 +53,7 @@
[super viewDidMoveToWindow];
if ([self window] && [self start] && URL) {
- WebResourceRequest *request = [WebResourceRequest requestWithURL:URL];
+ WebRequest *request = [WebRequest requestWithURL:URL];
[self loadRequest:request inTarget:nil withNotifyData:nil];
}
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index 95f09b4..e6a1e72 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -33,7 +33,7 @@
- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)ds
{
- if([error errorCode] == WebErrorCodeCancelled){
+ if([error errorCode] == WebFoundationErrorCancelled){
[self receivedError:NPRES_USER_BREAK];
} else {
[self receivedError:NPRES_NETWORK_ERR];
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
index 81f3ad7..e3c5f08 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -9,18 +9,18 @@
#import <WebKit/WebBaseNetscapePluginStream.h>
@class WebNetscapePluginEmbeddedView;
- at class WebResourceHandle;
- at class WebResourceRequest;
+ at class WebResource;
+ at class WebRequest;
@interface WebNetscapePluginStream : WebBaseNetscapePluginStream
{
WebNetscapePluginEmbeddedView *view;
NSMutableData *resourceData;
- WebResourceRequest *_startingRequest;
+ WebRequest *_startingRequest;
}
-- initWithRequest:(WebResourceRequest *)theRequest
+- initWithRequest:(WebRequest *)theRequest
pluginPointer:(NPP)thePluginPointer
notifyData:(void *)theNotifyData;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index ad54ddb..e51ebdd 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -13,13 +13,13 @@
@implementation WebNetscapePluginStream
-- initWithRequest:(WebResourceRequest *)theRequest
+- initWithRequest:(WebRequest *)theRequest
pluginPointer:(NPP)thePluginPointer
notifyData:(void *)theNotifyData
{
[super init];
- if(!theRequest || !thePluginPointer || ![WebResourceHandle canInitWithRequest:theRequest]){
+ if(!theRequest || !thePluginPointer || ![WebResource canInitWithRequest:theRequest]){
return nil;
}
@@ -72,13 +72,13 @@
}
}
-- (void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)theResponse
+- (void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)theResponse
{
[self setResponse:theResponse];
- [super handle:h didReceiveResponse:theResponse];
+ [super resource:h didReceiveResponse:theResponse];
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
if (transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
[resourceData appendData:data];
@@ -86,10 +86,10 @@
[self receivedData:data];
- [super handle:h didReceiveData:data];
+ [super resource:h didReceiveData:data];
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
[[view controller] _finishedLoadingResourceFromDataSource:[view dataSource]];
[self finishedLoadingWithData:resourceData];
@@ -97,10 +97,10 @@
[view release];
view = nil;
- [super handleDidFinishLoading: h];
+ [super resourceDidFinishLoading: h];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)result
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)result
{
[[view controller] _receivedError:result fromDataSource:[view dataSource]];
@@ -109,7 +109,7 @@
[view release];
view = nil;
- [super handle:h didFailLoadingWithError:result];
+ [super resource:h didFailLoadingWithError:result];
}
@end
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index c9fcff2..7139033 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -18,7 +18,7 @@
#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebRequest.h>
@implementation WebPluginController
@@ -102,7 +102,7 @@
ERROR("could not load URL %@ because plug-in has already been stopped", URL);
return;
}
- WebResourceRequest *request = [WebResourceRequest requestWithURL:URL];
+ WebRequest *request = [WebRequest 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 03dc46c..6a042e5 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -37,12 +37,12 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebSystemBits.h>
#import <WebFoundation/WebFileTypeMappings.h>
@@ -104,10 +104,10 @@
{
ASSERT(frame != nil);
- WebResourceRequest *request = nil;
+ WebRequest *request = nil;
if (URL != nil && [URL length] > 0) {
- request = [WebResourceRequest requestWithURL:[NSURL _web_URLWithString:URL]];
+ request = [WebRequest requestWithURL:[NSURL _web_URLWithString:URL]];
}
WebController *newController = [[[frame controller] windowOperationsDelegate] createWindowWithRequest:request];
@@ -222,7 +222,7 @@
ASSERT(frame != nil);
ASSERT(response != nil);
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:[NSURL _web_URLWithString:URL]];
+ WebRequest *request = [[WebRequest alloc] initWithURL:[NSURL _web_URLWithString:URL]];
id <WebResourceLoadDelegate> delegate = [[frame controller] resourceLoadDelegate];
id identifier;
@@ -361,12 +361,12 @@
- (BOOL)defersLoading
{
- return [[frame controller] _defersCallbacks];
+ return [[frame controller] defersCallbacks];
}
- (void)setDefersLoading:(BOOL)defers
{
- [[frame controller] _setDefersCallbacks:defers];
+ [[frame controller] setDefersCallbacks:defers];
}
- (void)setNeedsReapplyStyles
@@ -580,7 +580,7 @@ static BOOL loggedObjectCacheSize = NO;
- (void)loadEmptyDocumentSynchronously
{
NSURL *url = [[NSURL alloc] initWithString:@""];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:url];
+ WebRequest *request = [[WebRequest alloc] initWithURL:url];
[frame loadRequest:request];
[request release];
[url release];
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index b47ad29..74dd67b 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -35,12 +35,12 @@
- (NSString *)cookiesForURL:(NSString *)URL
{
- return [[[WebCookieManager sharedCookieManager] cookieRequestHeadersForURL:[NSURL _web_URLWithString:URL]] objectForKey:@"Cookie"];
+ return [[[WebCookieManager sharedCookieManager] cookieRequestHeaderFieldsForURL:[NSURL _web_URLWithString:URL]] objectForKey:@"Cookie"];
}
- (void)setCookies:(NSString *)cookies forURL:(NSString *)URL policyBaseURL:(NSString *)policyBaseURL
{
- [[WebCookieManager sharedCookieManager] setCookiesFromResponseHeaders:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"]
+ [[WebCookieManager sharedCookieManager] setCookiesFromResponseHeader:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"]
forURL:[NSURL _web_URLWithString:URL] policyBaseURL:[NSURL _web_URLWithString:policyBaseURL]];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
index e8f2248..5c1560b 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 WebResourceResponse;
+ at class WebResponse;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index fdbd185..aacdebf 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -13,10 +13,10 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebResourceHandleDelegate.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResourceDelegate.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/WebResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -46,7 +46,7 @@
[source _addSubresourceClient:client];
- WebResourceRequest *newRequest = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *newRequest = [[WebRequest alloc] initWithURL:URL];
[newRequest setRequestCachePolicy:[[source request] requestCachePolicy]];
[newRequest setResponseCachePolicy:[[source request] responseCachePolicy]];
[newRequest setReferrer:referrer];
@@ -61,7 +61,7 @@
[rLoader reportError];
- WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
+ WebError *badURLError = [[WebError alloc] initWithErrorCode:WebFoundationErrorBadURL
inDomain:WebErrorDomainWebFoundation
failingURL:[URL absoluteString]];
[[source controller] _receivedError:badURLError fromDataSource:source];
@@ -77,7 +77,7 @@
[[dataSource controller] _receivedError:error fromDataSource:dataSource];
}
--(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
+-(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)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
@@ -87,23 +87,23 @@
// properly on redirect when we have the new redirect
// request-adjusting API
- return [super handle: h willSendRequest: newRequest];
+ return [super resource: h willSendRequest: newRequest];
}
--(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
{
ASSERT(r);
[loader receivedResponse:r];
- [super handle:h didReceiveResponse:r];
+ [super resource:h didReceiveResponse:r];
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
[loader addData:data];
- [super handle:h didReceiveData:data];
+ [super resource:h didReceiveData:data];
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -116,10 +116,10 @@
[self release];
- [super handleDidFinishLoading:h];
+ [super resourceDidFinishLoading:h];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -127,7 +127,7 @@
[loader reportError];
[dataSource _removeSubresourceClient:self];
[self receivedError:error];
- [super handle:h didFailLoadingWithError:error];
+ [super resource:h didFailLoadingWithError:error];
[self release];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
index e8f2248..5c1560b 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 WebResourceResponse;
+ at class WebResponse;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index fdbd185..aacdebf 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -13,10 +13,10 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebResourceHandleDelegate.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResourceDelegate.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/WebResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -46,7 +46,7 @@
[source _addSubresourceClient:client];
- WebResourceRequest *newRequest = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *newRequest = [[WebRequest alloc] initWithURL:URL];
[newRequest setRequestCachePolicy:[[source request] requestCachePolicy]];
[newRequest setResponseCachePolicy:[[source request] responseCachePolicy]];
[newRequest setReferrer:referrer];
@@ -61,7 +61,7 @@
[rLoader reportError];
- WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
+ WebError *badURLError = [[WebError alloc] initWithErrorCode:WebFoundationErrorBadURL
inDomain:WebErrorDomainWebFoundation
failingURL:[URL absoluteString]];
[[source controller] _receivedError:badURLError fromDataSource:source];
@@ -77,7 +77,7 @@
[[dataSource controller] _receivedError:error fromDataSource:dataSource];
}
--(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
+-(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)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
@@ -87,23 +87,23 @@
// properly on redirect when we have the new redirect
// request-adjusting API
- return [super handle: h willSendRequest: newRequest];
+ return [super resource: h willSendRequest: newRequest];
}
--(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
{
ASSERT(r);
[loader receivedResponse:r];
- [super handle:h didReceiveResponse:r];
+ [super resource:h didReceiveResponse:r];
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
[loader addData:data];
- [super handle:h didReceiveData:data];
+ [super resource:h didReceiveData:data];
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -116,10 +116,10 @@
[self release];
- [super handleDidFinishLoading:h];
+ [super resourceDidFinishLoading:h];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -127,7 +127,7 @@
[loader reportError];
[dataSource _removeSubresourceClient:self];
[self receivedError:error];
- [super handle:h didFailLoadingWithError:error];
+ [super resource:h didFailLoadingWithError:error];
[self release];
}
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index 500b5f9..8be711b 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -8,22 +8,22 @@
@class WebController;
@class WebDataSource;
@class WebError;
- at class WebResourceHandle;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebResource;
+ at class WebRequest;
+ at class WebResponse;
- at protocol WebResourceHandleDelegate;
+ at protocol WebResourceDelegate;
@protocol WebResourceLoadDelegate;
- at interface WebBaseResourceHandleDelegate : NSObject <WebResourceHandleDelegate>
+ at interface WebBaseResourceHandleDelegate : NSObject <WebResourceDelegate>
{
@protected
WebDataSource *dataSource;
- WebResourceHandle *handle;
- WebResourceRequest *request;
+ WebResource *handle;
+ WebRequest *request;
@private
WebController *controller;
- WebResourceResponse *response;
+ WebResponse *response;
id identifier;
id <WebResourceLoadDelegate>resourceLoadDelegate;
id <WebResourceLoadDelegate>downloadDelegate;
@@ -32,10 +32,10 @@
BOOL defersCallbacks;
}
-- (BOOL)loadWithRequest:(WebResourceRequest *)request;
+- (BOOL)loadWithRequest:(WebRequest *)request;
// this method exists only to be subclassed, don't call it directly
-- (void)startLoading:(WebResourceRequest *)r;
+- (void)startLoading:(WebRequest *)r;
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 48e8f36..83e183a 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -7,10 +7,10 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
#import <WebKit/WebController.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -61,21 +61,21 @@
[super dealloc];
}
-- (void)startLoading:(WebResourceRequest *)r
+- (void)startLoading:(WebRequest *)r
{
[handle loadWithDelegate:self];
}
-- (BOOL)loadWithRequest:(WebResourceRequest *)r
+- (BOOL)loadWithRequest:(WebRequest *)r
{
ASSERT(handle == nil);
- handle = [[WebResourceHandle alloc] initWithRequest:r];
+ handle = [[WebResource alloc] initWithRequest:r];
if (!handle) {
return NO;
}
if (defersCallbacks) {
- [handle _setDefersCallbacks:YES];
+ [handle setDefersCallbacks:YES];
}
[self startLoading:r];
@@ -86,7 +86,7 @@
- (void)setDefersCallbacks:(BOOL)defers
{
defersCallbacks = defers;
- [handle _setDefersCallbacks:defers];
+ [handle setDefersCallbacks:defers];
}
- (BOOL)defersCallbacks
@@ -133,7 +133,7 @@
return NO;
}
--(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
+-(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -173,7 +173,7 @@
return request;
}
--(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -190,7 +190,7 @@
}
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -201,7 +201,7 @@
[resourceLoadDelegate resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -217,7 +217,7 @@
[self _releaseResources];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)result
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)result
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -267,7 +267,7 @@
- (WebError *)cancelledError
{
- return [WebError errorWithCode:WebErrorCodeCancelled
+ return [WebError errorWithCode:WebFoundationErrorCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:[[request URL] absoluteString]];
}
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index fd666b5..ae092e3 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -15,7 +15,7 @@
@class WebDownload;
@class WebError;
@class WebFrame;
- at class WebResourceHandle;
+ at class WebResource;
@class WebPreferences;
@class WebView;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 36dc1b6..4c66448 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -31,7 +31,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSUserDefaultsExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResource.h>
static const struct UserAgentSpoofTableEntry *_web_findSpoofTableEntry(const char *, unsigned);
@@ -538,17 +538,17 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
@implementation WebResourceLoadDelegate
-- identifierForInitialRequest: (WebResourceRequest *)request fromDataSource: (WebDataSource *)dataSource
+- identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
{
return [[[NSObject alloc] init] autorelease];
}
--(WebResourceRequest *)resource:identifier willSendRequest: (WebResourceRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+-(WebRequest *)resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
{
return newRequest;
}
--(void)resource:identifier didReceiveResponse: (WebResourceResponse *)response fromDataSource:(WebDataSource *)dataSource
+-(void)resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 42753ba..46d356f 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -10,8 +10,8 @@
@class WebError;
@class WebFrame;
@class WebPolicyPrivate;
- at class WebResourceResponse;
- at class WebResourceRequest;
+ at class WebResponse;
+ at class WebRequest;
/*!
@@ -101,7 +101,7 @@ typedef enum {
@param listener The object to call when the decision is made
*/
- (void)decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebResourceRequest *)request
+ andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener;
@@ -114,7 +114,7 @@ typedef enum {
@param frame The frame which is loading the URL.
*/
- (WebPolicyAction)contentPolicyForMIMEType:(NSString *)type
- andRequest:(WebResourceRequest *)request
+ andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame;
@@ -125,8 +125,8 @@ typedef enum {
@param request A WebResourceRequest for the partially loaded content.
@result The filename to use to save a loaded resource.
*/
-- (NSString *)savePathForResponse:(WebResourceResponse *)response
- andRequest:(WebResourceRequest *)request;
+- (NSString *)savePathForResponse:(WebResponse *)response
+ andRequest:(WebRequest *)request;
/*!
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 733fa7b..0670a53 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -65,14 +65,14 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
- (void)_downloadURL:(NSURL *)URL;
- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directoryPath;
-- (BOOL)_defersCallbacks;
-- (void)_setDefersCallbacks:(BOOL)defers;
+- (BOOL)defersCallbacks;
+- (void)setDefersCallbacks:(BOOL)defers;
- (void)_setTopLevelFrameName:(NSString *)name;
- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
- (WebFrame *)_findFrameNamed: (NSString *)name;
-- (WebController *)_openNewWindowWithRequest:(WebResourceRequest *)request behind:(BOOL)behind;
+- (WebController *)_openNewWindowWithRequest:(WebRequest *)request behind:(BOOL)behind;
- (NSMenu *)_menuForElement:(NSDictionary *)element;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index ed91cf6..5f1a234 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -19,13 +19,12 @@
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebCacheLoaderConstants.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
#import <WebCore/WebCoreSettings.h>
@@ -236,19 +235,19 @@
{
ASSERT(URL);
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:URL];
WebFrame *webFrame = [self mainFrame];
[webFrame _downloadRequest:request toDirectory:directory];
[request release];
}
-- (BOOL)_defersCallbacks
+- (BOOL)defersCallbacks
{
return _private->defersCallbacks;
}
-- (void)_setDefersCallbacks:(BOOL)defers
+- (void)setDefersCallbacks:(BOOL)defers
{
if (defers == _private->defersCallbacks) {
return;
@@ -297,7 +296,7 @@
return frame;
}
-- (WebController *)_openNewWindowWithRequest:(WebResourceRequest *)request behind:(BOOL)behind
+- (WebController *)_openNewWindowWithRequest:(WebRequest *)request behind:(BOOL)behind
{
WebController *newWindowController = [[self windowOperationsDelegate] createWindowWithRequest:request];
if (behind) {
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index fd22d72..5e8adcb 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -11,9 +11,9 @@
@class WebDataSourcePrivate;
@class WebError;
@class WebFrame;
- at class WebResourceHandle;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebResource;
+ at class WebRequest;
+ at class WebResponse;
@protocol WebDocumentRepresentation;
@@ -44,7 +44,7 @@
@param request The request to use in creating a datasource.
@result Returns an initialized WebDataSource.
*/
-- initWithRequest:(WebResourceRequest *)request;
+- initWithRequest:(WebRequest *)request;
/*!
@method data
@@ -83,19 +83,19 @@
@result Returns a reference to the original request that created the
datasource. This request will be unmodified by WebKit.
*/
-- (WebResourceRequest *)initialRequest;
+- (WebRequest *)initialRequest;
/*!
@method request
@result Returns the request that was used to create this datasource.
*/
--(WebResourceRequest *)request;
+-(WebRequest *)request;
/*!
@method response
@result returns the WebResourceResponse for the data source.
*/
-- (WebResourceResponse *)response;
+- (WebResponse *)response;
/*!
@method URL
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 8ab8238..1b2aa39 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -17,9 +17,9 @@
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
@implementation WebDataSource
@@ -28,7 +28,7 @@
{
id result = nil;
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:URL];
if (request) {
result = [self initWithRequest:request];
[request release];
@@ -40,7 +40,7 @@
return result;
}
--(id)initWithRequest:(WebResourceRequest *)request
+-(id)initWithRequest:(WebRequest *)request
{
self = [super init];
if (!self) {
@@ -100,17 +100,17 @@
return _private->controller;
}
--(WebResourceRequest *)initialRequest
+-(WebRequest *)initialRequest
{
return _private->originalRequest;
}
--(WebResourceRequest *)request
+-(WebRequest *)request
{
return _private->request;
}
-- (WebResourceResponse *)response
+- (WebResponse *)response
{
return _private->response;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 59dbf1b..e08e44d 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -12,8 +12,8 @@
@class WebHistoryItem;
@class WebIconLoader;
@class WebMainResourceClient;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebRequest;
+ at class WebResponse;
@class WebSubresourceClient;
@protocol WebDocumentRepresentation;
@@ -31,18 +31,18 @@
// This should only be used by the resourceLoadDelegate's
// identifierForInitialRequest:fromDatasource: method. It is
// not guaranteed to remain unchanged, as requests are mutable.
- WebResourceRequest *originalRequest;
+ WebRequest *originalRequest;
// A copy of the original request used to create the data source.
// We have to copy the request because requests are mutable.
- WebResourceRequest *originalRequestCopy;
+ WebRequest *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.
- WebResourceRequest *request;
+ WebRequest *request;
- WebResourceResponse *response;
+ WebResponse *response;
// Client for main resource.
WebMainResourceClient *mainClient;
@@ -90,7 +90,7 @@
// The last request that we checked click policy for - kept around
// so we can avoid asking again needlessly.
- WebResourceRequest *lastCheckedRequest;
+ WebRequest *lastCheckedRequest;
// We retain all the received responses so we can play back the
// WebResourceLoadDelegate messages if the item is loaded from the
@@ -125,8 +125,8 @@
- (double)_loadingStartedTime;
- (void)_setTitle:(NSString *)title;
- (void)_setURL:(NSURL *)URL;
-- (void)_setRequest:(WebResourceRequest *)request;
-- (void)_setResponse:(WebResourceResponse *)response;
+- (void)_setRequest:(WebRequest *)request;
+- (void)_setResponse:(WebResponse *)response;
- (void)_layoutChildren;
- (void)_clearErrors;
- (void)_setMainDocumentError:(WebError *)error;
@@ -154,11 +154,11 @@
- (void)_finishedLoading;
- (void)_receivedError:(WebError *)error complete:(BOOL)isComplete;
- (void)_defersCallbacksChanged;
-- (WebResourceRequest *)_originalRequest;
+- (WebRequest *)_originalRequest;
- (NSDictionary *)_triggeringAction;
- (void)_setTriggeringAction:(NSDictionary *)action;
-- (WebResourceRequest *)_lastCheckedRequest;
-- (void)_setLastCheckedRequest:(WebResourceRequest *)request;
+- (WebRequest *)_lastCheckedRequest;
+- (void)_setLastCheckedRequest:(WebRequest *)request;
- (void)_setIsDownloading:(BOOL)isDownloading;
- (void)_setDownloadPath:(NSString *)downloadPath;
- (void)_setDownloadDirectory:(NSString *)downloadDirectory;
@@ -169,7 +169,7 @@
- (BOOL)_storedInPageCache;
- (BOOL)_loadingFromPageCache;
-- (void)_addResponse: (WebResourceResponse *)r;
+- (void)_addResponse: (WebResponse *)r;
- (NSArray *)_responses;
- (void)_stopLoadingWithError:(WebError *)error;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 6003be4..f6d1bf0 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -30,14 +30,14 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPResourceResponse.h>
+#import <WebFoundation/WebHTTPResponse.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/WebHTTPRequest.h>
@implementation WebDataSourcePrivate
@@ -196,7 +196,7 @@
if (_private->subresourceClients == nil) {
_private->subresourceClients = [[NSMutableArray alloc] init];
}
- if ([_private->controller _defersCallbacks]) {
+ if ([_private->controller defersCallbacks]) {
[client setDefersCallbacks:YES];
}
[_private->subresourceClients addObject:client];
@@ -227,7 +227,7 @@
[_private->mainClient cancel];
}else{
// Main handle is already done. Set the cancelled error.
- WebError *cancelledError = [WebError errorWithCode:WebErrorCodeCancelled
+ WebError *cancelledError = [WebError errorWithCode:WebFoundationErrorCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:[[self URL] absoluteString]];
[self _setMainDocumentError:cancelledError];
@@ -301,20 +301,20 @@
- (void)_setURL:(NSURL *)URL
{
- WebResourceRequest *newRequest = [_private->request copy];
+ WebRequest *newRequest = [_private->request copy];
[_private->request release];
[newRequest setURL:URL];
_private->request = newRequest;
}
-- (void)_setRequest:(WebResourceRequest *)request
+- (void)_setRequest:(WebRequest *)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);
- WebResourceRequest *oldRequest = _private->request;
+ WebRequest *oldRequest = _private->request;
_private->request = [request retain];
@@ -327,7 +327,7 @@
[oldRequest release];
}
-- (void)_setResponse:(WebResourceResponse *)response
+- (void)_setResponse:(WebResponse *)response
{
[_private->response release];
_private->response = [response retain];
@@ -466,8 +466,8 @@
bool reload = loadType == WebFrameLoadTypeReload
|| loadType == WebFrameLoadTypeReloadAllowingStaleData;
- NSDictionary *headers = [_private->response isKindOfClass:[WebHTTPResourceResponse class]]
- ? [(WebHTTPResourceResponse *)_private->response headers] : nil;
+ NSDictionary *headers = [_private->response isKindOfClass:[WebHTTPResponse class]]
+ ? [(WebHTTPResponse *)_private->response header] : nil;
LOG(Loading, "committed resource = %@", [[self request] URL]);
_private->committed = TRUE;
@@ -603,7 +603,7 @@
- (void)_defersCallbacksChanged
{
- BOOL defers = [_private->controller _defersCallbacks];
+ BOOL defers = [_private->controller defersCallbacks];
if (defers == _private->defersCallbacks) {
return;
@@ -621,7 +621,7 @@
[[[self webFrame] children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
}
-- (WebResourceRequest *)_originalRequest
+- (WebRequest *)_originalRequest
{
return _private->originalRequestCopy;
}
@@ -639,16 +639,16 @@
}
-- (WebResourceRequest *)_lastCheckedRequest
+- (WebRequest *)_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:(WebResourceRequest *)request
+- (void)_setLastCheckedRequest:(WebRequest *)request
{
- WebResourceRequest *oldRequest = _private->lastCheckedRequest;
+ WebRequest *oldRequest = _private->lastCheckedRequest;
_private->lastCheckedRequest = [request copy];
[oldRequest release];
}
@@ -717,7 +717,7 @@
return _private->loadingFromPageCache;
}
-- (void)_addResponse: (WebResourceResponse *)r
+- (void)_addResponse: (WebResponse *)r
{
if (!_private->responses)
_private->responses = [[NSMutableArray alloc] init];
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 17eb3b1..074e3cb 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -15,10 +15,10 @@
#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebLocalizableStrings.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
@implementation WebDefaultContextMenuDelegate
@@ -93,7 +93,7 @@
linkURL = [element objectForKey:WebElementLinkURLKey];
if (linkURL) {
- if([WebResourceHandle canInitWithRequest:[WebResourceRequest requestWithURL:linkURL]]){
+ if([WebResource canInitWithRequest:[WebRequest requestWithURL:linkURL]]){
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenLinkInNewWindow]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagDownloadLinkToDisk]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopyLinkToClipboard]];
@@ -130,7 +130,7 @@
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
WebController *controller = [webFrame controller];
- WebResourceRequest *request = [WebResourceRequest requestWithURL:URL];
+ WebRequest *request = [WebRequest 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 783cda3..d18844b 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -7,9 +7,9 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebFrame.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
@implementation WebDefaultPolicyDelegate
@@ -33,7 +33,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
- (WebPolicyAction)contentPolicyForMIMEType:(NSString *)type
- andRequest:(WebResourceRequest *)request
+ andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame;
{
if ([[request URL] isFileURL]) {
@@ -54,18 +54,18 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
}
-- (NSString *)savePathForResponse:(WebResourceResponse *)response
- andRequest:(WebResourceRequest *)request
+- (NSString *)savePathForResponse:(WebResponse *)response
+ andRequest:(WebRequest *)request
{
return nil;
}
- (void)decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebResourceRequest *)request
+ andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener
{
- if ([WebResourceHandle canInitWithRequest:request]) {
+ if ([WebResource canInitWithRequest:request]) {
[listener usePolicy:WebPolicyUse];
}else{
[listener usePolicy:WebPolicyOpenURL];
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 08e11a5..7d0ee08 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -13,7 +13,7 @@
@class WebError;
@class WebFramePrivate;
@class WebView;
- at class WebResourceRequest;
+ at class WebRequest;
/*!
@class WebFrame
@@ -70,7 +70,7 @@
@method loadRequest:
@param request The web request to load.
*/
--(void)loadRequest:(WebResourceRequest *)request;
+-(void)loadRequest:(WebRequest *)request;
/*!
@method dataSource
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 0059a68..b86caa6 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -22,8 +22,8 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebNSStringExtras.h>
@implementation WebFrame
@@ -106,13 +106,13 @@
return [_private dataSource];
}
-- (void)loadRequest:(WebResourceRequest *)request
+- (void)loadRequest:(WebRequest *)request
{
WebFrameLoadType loadType;
// note this copies request
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
- WebResourceRequest *r = [newDataSource request];
+ WebRequest *r = [newDataSource request];
[self _addExtraFieldsToRequest:r alwaysFromRequest: NO];
if ([self _shouldTreatURLAsSameAsCurrent:[request URL]]) {
[r setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
@@ -149,11 +149,11 @@
// initWithRequest copies the request
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:[dataSource request]];
- WebResourceRequest *request = [newDataSource request];
+ WebRequest *request = [newDataSource request];
[request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
// If we're about to rePOST, set up action so the app can warn the user
- if ([[request method] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ if ([[request requestMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
NSDictionary *action = [self _actionInformationForNavigationType:WebNavigationTypeFormResubmitted event:nil originalURL:[request URL]];
[newDataSource _setTriggeringAction:action];
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index a02763e..c87d8a6 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -13,7 +13,7 @@
@class WebFrameBridge;
@class WebHistoryItem;
@class WebView;
- at class WebResourceRequest;
+ at class WebRequest;
typedef enum {
WebFrameStateProvisional,
@@ -65,7 +65,7 @@ typedef enum {
WebPolicyDecisionListener *listener;
// state we'll need to continue after waiting for the policy delegate's decision
- WebResourceRequest *policyRequest;
+ WebRequest *policyRequest;
id policyTarget;
SEL policySelector;
NSDictionary *policyFormValues;
@@ -115,9 +115,9 @@ typedef enum {
- (void)_setLoadType: (WebFrameLoadType)loadType;
- (WebFrameLoadType)_loadType;
-- (void)_addExtraFieldsToRequest:(WebResourceRequest *)request alwaysFromRequest: (BOOL)f;
+- (void)_addExtraFieldsToRequest:(WebRequest *)request alwaysFromRequest: (BOOL)f;
-- (void)_checkNavigationPolicyForRequest:(WebResourceRequest *)request dataSource:(WebDataSource *)dataSource formValues:(NSDictionary *)values andCall:(id)target withSelector:(SEL)selector;
+- (void)_checkNavigationPolicyForRequest:(WebRequest *)request dataSource:(WebDataSource *)dataSource formValues:(NSDictionary *)values andCall:(id)target withSelector:(SEL)selector;
- (void)_invalidatePendingPolicyDecisionCallingDefaultAction:(BOOL)call;
@@ -147,7 +147,7 @@ typedef enum {
- (void)_loadDataSource:(WebDataSource *)dataSource withLoadType:(WebFrameLoadType)type formValues:(NSDictionary *)values;
-- (void)_downloadRequest:(WebResourceRequest *)request toDirectory:(NSString *)directory;
+- (void)_downloadRequest:(WebRequest *)request toDirectory:(NSString *)directory;
- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 237965e..1dcdf34 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -31,10 +31,10 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/WebHTTPRequest.h>
#import <WebFoundation/WebSynchronousResult.h>
#ifndef NDEBUG
@@ -90,7 +90,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
*/
@interface WebFrame (ForwardDecls)
-- (void)_loadRequest:(WebResourceRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formValues:(NSDictionary *)values;
+- (void)_loadRequest:(WebRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formValues:(NSDictionary *)values;
- (NSDictionary *)_actionInformationForLoadType:(WebFrameLoadType)loadType isFormSubmission:(BOOL)isFormSubmission event:(NSEvent *)event originalURL:(NSURL *)URL;
@@ -227,7 +227,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
- (WebHistoryItem *)_createItem
{
WebDataSource *dataSrc = [self dataSource];
- WebResourceRequest *request = [dataSrc request];
+ WebRequest *request = [dataSrc request];
NSURL *URL = [request URL];
WebHistoryItem *bfItem;
@@ -237,8 +237,8 @@ Repeat load of the same URL (by any other means of navigation other than the rel
[bfItem setOriginalURLString:[[[dataSrc _originalRequest] URL] absoluteString]];
// save form state if this is a POST
- if ([[request method] _web_isCaseInsensitiveEqualToString:@"POST"]) {
- [bfItem setFormData:[request data]];
+ if ([[request requestMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ [bfItem setFormData:[request requestData]];
[bfItem setFormContentType:[request contentType]];
[bfItem setFormReferrer:[request referrer]];
}
@@ -758,7 +758,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _restoreScrollPosition];
NSArray *responses = [[self dataSource] _responses];
- WebResourceResponse *response;
+ WebResponse *response;
int i, count = [responses count];
for (i = 0; i < count; i++){
response = [responses objectAtIndex: i];
@@ -1016,14 +1016,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _loadDataSource:newDataSource withLoadType:loadType formValues:nil];
}
else {
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:itemURL];
+ WebRequest *request = [[WebRequest 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.
NSDictionary *action;
if (formData) {
- [request setMethod:@"POST"];
- [request setData:formData];
+ [request setRequestMethod:@"POST"];
+ [request setRequestData:formData];
[request setContentType:[item formContentType]];
[request setReferrer:[item formReferrer]];
@@ -1034,9 +1034,9 @@ 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:WebRequestCachePolicyReturnCacheObjectDontLoadFromOriginIfNoCacheObject];
- WebSynchronousResult *result = [WebResourceHandle sendSynchronousRequest:request];
- if ([result error]) {
+ [request setRequestCachePolicy:WebRequestCachePolicyUseCacheDontLoad];
+ WebSynchronousResult *result = [WebResource sendSynchronousRequest:request];
+ if ([[result response] error]) {
// Not in WF cache
[request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
action = [self _actionInformationForNavigationType:WebNavigationTypeFormResubmitted event:nil originalURL:itemURL];
@@ -1052,7 +1052,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
case WebFrameLoadTypeBack:
case WebFrameLoadTypeForward:
case WebFrameLoadTypeIndexedBackForward:
- [request setRequestCachePolicy:WebRequestCachePolicyReturnCacheObjectLoadFromOriginIfNoCacheObject];
+ [request setRequestCachePolicy:WebRequestCachePolicyUseCacheElseLoad];
break;
case WebFrameLoadTypeStandard:
case WebFrameLoadTypeInternal:
@@ -1140,7 +1140,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _recursiveGoToItem:item fromItem:currItem withLoadType:type];
}
-- (void)_loadRequest:(WebResourceRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formValues:(NSDictionary *)values
+- (void)_loadRequest:(WebRequest *)request triggeringAction:(NSDictionary *)action loadType:(WebFrameLoadType)loadType formValues:(NSDictionary *)values
{
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
[newDataSource _setTriggeringAction:action];
@@ -1215,7 +1215,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[_private->listener release];
_private->listener = nil;
- WebResourceRequest *request = _private->policyRequest;
+ WebRequest *request = _private->policyRequest;
id target = _private->policyTarget;
SEL selector = _private->policySelector;
NSDictionary *formValues = _private->policyFormValues;
@@ -1234,7 +1234,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[formValues release];
}
-- (void)_checkNavigationPolicyForRequest:(WebResourceRequest *)request dataSource:(WebDataSource *)dataSource formValues:(NSDictionary *)values andCall:(id)target withSelector:(SEL)selector
+- (void)_checkNavigationPolicyForRequest:(WebRequest *)request dataSource:(WebDataSource *)dataSource formValues:(NSDictionary *)values andCall:(id)target withSelector:(SEL)selector
{
NSDictionary *action = [dataSource _triggeringAction];
if (action == nil) {
@@ -1276,7 +1276,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
-(void)_continueAfterNavigationPolicy:(WebPolicyAction)policy
{
- WebResourceRequest *request = [[_private->policyRequest retain] autorelease];
+ WebRequest *request = [[_private->policyRequest retain] autorelease];
id target = [[_private->policyTarget retain] autorelease];
SEL selector = _private->policySelector;
NSDictionary *formValues = [[_private->policyFormValues retain] autorelease];
@@ -1325,7 +1325,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
break;
case WebPolicyUse:
- if (![WebResourceHandle canInitWithRequest:request]) {
+ if (![WebResource canInitWithRequest:request]) {
[self _handleUnimplementablePolicy:policy errorCode:WebKitErrorCannotShowURL forURL:[request URL]];
} else {
shouldContinue = YES;
@@ -1339,7 +1339,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[target performSelector:selector withObject:(shouldContinue ? request : nil) withObject:formValues];
}
--(void)_continueFragmentScrollAfterNavigationPolicy:(WebResourceRequest *)request formValues:(NSDictionary *)values
+-(void)_continueFragmentScrollAfterNavigationPolicy:(WebRequest *)request formValues:(NSDictionary *)values
{
if (!request) {
return;
@@ -1378,7 +1378,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[[[self controller] locationChangeDelegate] locationChangedWithinPageForDataSource:dataSrc];
}
-- (void)_addExtraFieldsToRequest:(WebResourceRequest *)request alwaysFromRequest: (BOOL)f
+- (void)_addExtraFieldsToRequest:(WebRequest *)request alwaysFromRequest: (BOOL)f
{
[request setUserAgent:[[self controller] userAgentForURL:[request URL]]];
@@ -1396,7 +1396,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_loadURL:(NSURL *)URL loadType:(WebFrameLoadType)loadType triggeringEvent:(NSEvent *)event formValues:(NSDictionary *)values
{
BOOL isFormSubmission = (values != nil);
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:URL];
[request setReferrer:[_private->bridge referrer]];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (event != nil || isFormSubmission)];
if (loadType == WebFrameLoadTypeReload) {
@@ -1504,11 +1504,11 @@ 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.
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:URL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: YES];
[request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
- [request setMethod:@"POST"];
- [request setData:data];
+ [request setRequestMethod:@"POST"];
+ [request setRequestData:data];
[request setContentType:contentType];
[request setReferrer:[_private->bridge referrer]];
@@ -1584,8 +1584,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return;
}
- WebResourceRequest *request = [[dataSource request] copy];
- [request setRequestCachePolicy:WebRequestCachePolicyReturnCacheObjectLoadFromOriginIfNoCacheObject];
+ WebRequest *request = [[dataSource request] copy];
+ [request setRequestCachePolicy:WebRequestCachePolicyUseCacheElseLoad];
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
[request release];
@@ -1688,7 +1688,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return nil;
}
--(void)_continueLoadRequestAfterNavigationPolicy:(WebResourceRequest *)request formValues:(NSDictionary *)values
+-(void)_continueLoadRequestAfterNavigationPolicy:(WebRequest *)request formValues:(NSDictionary *)values
{
if (!request) {
[self _resetBackForwardListToCurrent];
@@ -1752,7 +1752,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _checkNavigationPolicyForRequest:[newDataSource request] dataSource:newDataSource formValues:values andCall:self withSelector:@selector(_continueLoadRequestAfterNavigationPolicy:formValues:)];
}
-- (void)_downloadRequest:(WebResourceRequest *)request toDirectory:(NSString *)directory
+- (void)_downloadRequest:(WebRequest *)request toDirectory:(NSString *)directory
{
WebDataSource *dataSource = [[WebDataSource alloc] initWithRequest:request];
[dataSource _setIsDownloading:YES];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 3155e58..e05bc0c 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/WebResourceRequest.h>
+#import <WebFoundation/WebRequest.h>
enum {
SpaceKey = 0x0020
@@ -127,7 +127,7 @@ enum {
NSURL *URL = [[sender draggingPasteboard] _web_bestURL];
if (URL) {
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:URL];
[[[self controller] mainFrame] loadRequest:request];
[request release];
}
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 8fca05a..c89e8ea 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -19,7 +19,7 @@
#import <WebKit/WebTextView.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
@implementation WebViewPrivate
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index b3dcffa..fc58e43 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/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
@interface WebHTMLRepresentationPrivate : NSObject
{
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index 500b5f9..8be711b 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -8,22 +8,22 @@
@class WebController;
@class WebDataSource;
@class WebError;
- at class WebResourceHandle;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebResource;
+ at class WebRequest;
+ at class WebResponse;
- at protocol WebResourceHandleDelegate;
+ at protocol WebResourceDelegate;
@protocol WebResourceLoadDelegate;
- at interface WebBaseResourceHandleDelegate : NSObject <WebResourceHandleDelegate>
+ at interface WebBaseResourceHandleDelegate : NSObject <WebResourceDelegate>
{
@protected
WebDataSource *dataSource;
- WebResourceHandle *handle;
- WebResourceRequest *request;
+ WebResource *handle;
+ WebRequest *request;
@private
WebController *controller;
- WebResourceResponse *response;
+ WebResponse *response;
id identifier;
id <WebResourceLoadDelegate>resourceLoadDelegate;
id <WebResourceLoadDelegate>downloadDelegate;
@@ -32,10 +32,10 @@
BOOL defersCallbacks;
}
-- (BOOL)loadWithRequest:(WebResourceRequest *)request;
+- (BOOL)loadWithRequest:(WebRequest *)request;
// this method exists only to be subclassed, don't call it directly
-- (void)startLoading:(WebResourceRequest *)r;
+- (void)startLoading:(WebRequest *)r;
- (void)setDataSource:(WebDataSource *)d;
- (WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 48e8f36..83e183a 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -7,10 +7,10 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebResponse.h>
#import <WebKit/WebController.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -61,21 +61,21 @@
[super dealloc];
}
-- (void)startLoading:(WebResourceRequest *)r
+- (void)startLoading:(WebRequest *)r
{
[handle loadWithDelegate:self];
}
-- (BOOL)loadWithRequest:(WebResourceRequest *)r
+- (BOOL)loadWithRequest:(WebRequest *)r
{
ASSERT(handle == nil);
- handle = [[WebResourceHandle alloc] initWithRequest:r];
+ handle = [[WebResource alloc] initWithRequest:r];
if (!handle) {
return NO;
}
if (defersCallbacks) {
- [handle _setDefersCallbacks:YES];
+ [handle setDefersCallbacks:YES];
}
[self startLoading:r];
@@ -86,7 +86,7 @@
- (void)setDefersCallbacks:(BOOL)defers
{
defersCallbacks = defers;
- [handle _setDefersCallbacks:defers];
+ [handle setDefersCallbacks:defers];
}
- (BOOL)defersCallbacks
@@ -133,7 +133,7 @@
return NO;
}
--(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
+-(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)newRequest
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -173,7 +173,7 @@
return request;
}
--(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -190,7 +190,7 @@
}
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -201,7 +201,7 @@
[resourceLoadDelegate resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -217,7 +217,7 @@
[self _releaseResources];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)result
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)result
{
ASSERT(handle == h);
ASSERT(!reachedTerminalState);
@@ -267,7 +267,7 @@
- (WebError *)cancelledError
{
- return [WebError errorWithCode:WebErrorCodeCancelled
+ return [WebError errorWithCode:WebFoundationErrorCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:[[request URL] absoluteString]];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 0290599..1e7d242 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -13,11 +13,11 @@
@class WebDownload;
@class WebDataSource;
- at class WebResourceHandle;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebResource;
+ at class WebRequest;
+ at class WebResponse;
- at protocol WebResourceHandleDelegate;
+ at protocol WebResourceDelegate;
@protocol WebResourceLoadDelegate;
@interface WebMainResourceClient : WebBaseResourceHandleDelegate
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index a59fc00..95a4cfa 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -9,12 +9,11 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
-#import <WebFoundation/WebResourceResponsePrivate.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/WebMutableResponse.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
@@ -128,15 +127,15 @@
[self cancelQuietly];
}
--(void)continueAfterNavigationPolicy:(WebResourceRequest *)_request formValues:(NSDictionary *)values
+-(void)continueAfterNavigationPolicy:(WebRequest *)_request formValues:(NSDictionary *)values
{
- [[dataSource controller] _setDefersCallbacks:NO];
+ [[dataSource controller] setDefersCallbacks:NO];
if (!_request) {
[self stopLoadingForPolicyChange];
}
}
--(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
+-(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)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
@@ -155,7 +154,7 @@
}
// note super will make a copy for us, so reassigning newRequest is important
- newRequest = [super handle:h willSendRequest:newRequest];
+ newRequest = [super resource:h willSendRequest:newRequest];
// Don't set this on the first request. It is set
// when the main load was started.
@@ -165,10 +164,10 @@
return newRequest;
}
--(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResourceResponse *)r
+-(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResponse *)r
{
- [[dataSource controller] _setDefersCallbacks:NO];
- WebResourceRequest *req = [dataSource request];
+ [[dataSource controller] setDefersCallbacks:NO];
+ WebRequest *req = [dataSource request];
switch (contentPolicy) {
case WebPolicyShow:
@@ -242,15 +241,15 @@
ERROR("contentPolicyForMIMEType:andRequest:inFrame: returned an invalid content policy.");
}
- [super handle:handle didReceiveResponse:r];
+ [super resource:handle didReceiveResponse:r];
if ([[req URL] _web_shouldLoadAsEmptyDocument]) {
- [self handleDidFinishLoading:handle];
+ [self resourceDidFinishLoading:handle];
}
}
--(void)checkContentPolicyForResponse:(WebResourceResponse *)r andCallSelector:(SEL)selector
+-(void)checkContentPolicyForResponse:(WebResponse *)r andCallSelector:(SEL)selector
{
WebPolicyAction contentPolicy =
[[[dataSource controller] policyDelegate] contentPolicyForMIMEType:[r contentType]
@@ -260,16 +259,16 @@
}
--(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
{
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([dataSource isDownloading] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([dataSource isDownloading] || ![[dataSource controller] defersCallbacks]);
[dataSource _setResponse:r];
LOG(Download, "main content type: %@", [r contentType]);
- [[dataSource controller] _setDefersCallbacks:YES];
+ [[dataSource controller] setDefersCallbacks:YES];
// Figure out the content policy.
if (![dataSource isDownloading]) {
@@ -281,13 +280,13 @@
_contentLength = [r contentLength];
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
ASSERT(data);
ASSERT([data length] != 0);
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([self isDownload] || ![[dataSource controller] defersCallbacks]);
LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
@@ -303,7 +302,7 @@
complete:NO];
}
- [super handle:h didReceiveData:data];
+ [super resource:h didReceiveData:data];
_bytesReceived += [data length];
if(downloadError){
@@ -314,11 +313,11 @@
LOG(Download, "%d of %d", _bytesReceived, _contentLength);
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([self isDownload] || ![[dataSource controller] defersCallbacks]);
LOG(Loading, "URL = %@", [dataSource URL]);
// Calls in this method will most likely result in a call to release, so we must retain.
@@ -338,9 +337,9 @@
}
if(downloadError){
- [super handle:h didFailLoadingWithError:downloadError];
+ [super resource:h didFailLoadingWithError:downloadError];
} else {
- [super handleDidFinishLoading:h];
+ [super resourceDidFinishLoading:h];
}
[download release];
@@ -349,32 +348,32 @@
[self release];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
{
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([self isDownload] || ![[dataSource controller] defersCallbacks]);
LOG(Loading, "URL = %@, error = %@", [error failingURL], [error errorDescription]);
// Calling receivedError will likely result in a call to release, so we must retain.
[self retain];
[self receivedError:error complete:YES];
- [super handle:h didFailLoadingWithError:error];
+ [super resource:h didFailLoadingWithError:error];
[self release];
}
-- (void)startLoading:(WebResourceRequest *)r
+- (void)startLoading:(WebRequest *)r
{
if ([[r URL] _web_shouldLoadAsEmptyDocument]) {
- [self handle:handle willSendRequest:r];
+ [self resource:handle willSendRequest:r];
- WebResourceResponse *rsp = [[WebResourceResponse alloc] init];
- [rsp _setURL:[r URL]];
- [rsp _setContentType:@"text/html"];
- [rsp _setContentLength:0];
- [self handle:handle didReceiveResponse:rsp];
+ WebResponse *rsp = [[WebResponse alloc] init];
+ [rsp setURL:[r URL]];
+ [rsp setContentType:@"text/html"];
+ [rsp setContentLength:0];
+ [self resource:handle didReceiveResponse:rsp];
[rsp release];
} else {
[super startLoading:r];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 0290599..1e7d242 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -13,11 +13,11 @@
@class WebDownload;
@class WebDataSource;
- at class WebResourceHandle;
- at class WebResourceRequest;
- at class WebResourceResponse;
+ at class WebResource;
+ at class WebRequest;
+ at class WebResponse;
- at protocol WebResourceHandleDelegate;
+ at protocol WebResourceDelegate;
@protocol WebResourceLoadDelegate;
@interface WebMainResourceClient : WebBaseResourceHandleDelegate
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index a59fc00..95a4cfa 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -9,12 +9,11 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebHTTPResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
-#import <WebFoundation/WebResourceResponsePrivate.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
+#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/WebResponse.h>
+#import <WebFoundation/WebMutableResponse.h>
#import <WebKit/WebController.h>
#import <WebKit/WebControllerPrivate.h>
@@ -128,15 +127,15 @@
[self cancelQuietly];
}
--(void)continueAfterNavigationPolicy:(WebResourceRequest *)_request formValues:(NSDictionary *)values
+-(void)continueAfterNavigationPolicy:(WebRequest *)_request formValues:(NSDictionary *)values
{
- [[dataSource controller] _setDefersCallbacks:NO];
+ [[dataSource controller] setDefersCallbacks:NO];
if (!_request) {
[self stopLoadingForPolicyChange];
}
}
--(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)newRequest
+-(WebRequest *)resource:(WebResource *)h willSendRequest:(WebRequest *)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
@@ -155,7 +154,7 @@
}
// note super will make a copy for us, so reassigning newRequest is important
- newRequest = [super handle:h willSendRequest:newRequest];
+ newRequest = [super resource:h willSendRequest:newRequest];
// Don't set this on the first request. It is set
// when the main load was started.
@@ -165,10 +164,10 @@
return newRequest;
}
--(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResourceResponse *)r
+-(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(WebResponse *)r
{
- [[dataSource controller] _setDefersCallbacks:NO];
- WebResourceRequest *req = [dataSource request];
+ [[dataSource controller] setDefersCallbacks:NO];
+ WebRequest *req = [dataSource request];
switch (contentPolicy) {
case WebPolicyShow:
@@ -242,15 +241,15 @@
ERROR("contentPolicyForMIMEType:andRequest:inFrame: returned an invalid content policy.");
}
- [super handle:handle didReceiveResponse:r];
+ [super resource:handle didReceiveResponse:r];
if ([[req URL] _web_shouldLoadAsEmptyDocument]) {
- [self handleDidFinishLoading:handle];
+ [self resourceDidFinishLoading:handle];
}
}
--(void)checkContentPolicyForResponse:(WebResourceResponse *)r andCallSelector:(SEL)selector
+-(void)checkContentPolicyForResponse:(WebResponse *)r andCallSelector:(SEL)selector
{
WebPolicyAction contentPolicy =
[[[dataSource controller] policyDelegate] contentPolicyForMIMEType:[r contentType]
@@ -260,16 +259,16 @@
}
--(void)handle:(WebResourceHandle *)h didReceiveResponse:(WebResourceResponse *)r
+-(void)resource:(WebResource *)h didReceiveResponse:(WebResponse *)r
{
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([dataSource isDownloading] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([dataSource isDownloading] || ![[dataSource controller] defersCallbacks]);
[dataSource _setResponse:r];
LOG(Download, "main content type: %@", [r contentType]);
- [[dataSource controller] _setDefersCallbacks:YES];
+ [[dataSource controller] setDefersCallbacks:YES];
// Figure out the content policy.
if (![dataSource isDownloading]) {
@@ -281,13 +280,13 @@
_contentLength = [r contentLength];
}
-- (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
+- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
{
ASSERT(data);
ASSERT([data length] != 0);
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([self isDownload] || ![[dataSource controller] defersCallbacks]);
LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
@@ -303,7 +302,7 @@
complete:NO];
}
- [super handle:h didReceiveData:data];
+ [super resource:h didReceiveData:data];
_bytesReceived += [data length];
if(downloadError){
@@ -314,11 +313,11 @@
LOG(Download, "%d of %d", _bytesReceived, _contentLength);
}
-- (void)handleDidFinishLoading:(WebResourceHandle *)h
+- (void)resourceDidFinishLoading:(WebResource *)h
{
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([self isDownload] || ![[dataSource controller] defersCallbacks]);
LOG(Loading, "URL = %@", [dataSource URL]);
// Calls in this method will most likely result in a call to release, so we must retain.
@@ -338,9 +337,9 @@
}
if(downloadError){
- [super handle:h didFailLoadingWithError:downloadError];
+ [super resource:h didFailLoadingWithError:downloadError];
} else {
- [super handleDidFinishLoading:h];
+ [super resourceDidFinishLoading:h];
}
[download release];
@@ -349,32 +348,32 @@
[self release];
}
-- (void)handle:(WebResourceHandle *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
{
- ASSERT(![h _defersCallbacks]);
+ ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
- ASSERT([self isDownload] || ![[dataSource controller] _defersCallbacks]);
+ ASSERT([self isDownload] || ![[dataSource controller] defersCallbacks]);
LOG(Loading, "URL = %@, error = %@", [error failingURL], [error errorDescription]);
// Calling receivedError will likely result in a call to release, so we must retain.
[self retain];
[self receivedError:error complete:YES];
- [super handle:h didFailLoadingWithError:error];
+ [super resource:h didFailLoadingWithError:error];
[self release];
}
-- (void)startLoading:(WebResourceRequest *)r
+- (void)startLoading:(WebRequest *)r
{
if ([[r URL] _web_shouldLoadAsEmptyDocument]) {
- [self handle:handle willSendRequest:r];
+ [self resource:handle willSendRequest:r];
- WebResourceResponse *rsp = [[WebResourceResponse alloc] init];
- [rsp _setURL:[r URL]];
- [rsp _setContentType:@"text/html"];
- [rsp _setContentLength:0];
- [self handle:handle didReceiveResponse:rsp];
+ WebResponse *rsp = [[WebResponse alloc] init];
+ [rsp setURL:[r URL]];
+ [rsp setContentType:@"text/html"];
+ [rsp setContentLength:0];
+ [self resource:handle didReceiveResponse:rsp];
[rsp release];
} else {
[super startLoading:r];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 42753ba..46d356f 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -10,8 +10,8 @@
@class WebError;
@class WebFrame;
@class WebPolicyPrivate;
- at class WebResourceResponse;
- at class WebResourceRequest;
+ at class WebResponse;
+ at class WebRequest;
/*!
@@ -101,7 +101,7 @@ typedef enum {
@param listener The object to call when the decision is made
*/
- (void)decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(WebResourceRequest *)request
+ andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener;
@@ -114,7 +114,7 @@ typedef enum {
@param frame The frame which is loading the URL.
*/
- (WebPolicyAction)contentPolicyForMIMEType:(NSString *)type
- andRequest:(WebResourceRequest *)request
+ andRequest:(WebRequest *)request
inFrame:(WebFrame *)frame;
@@ -125,8 +125,8 @@ typedef enum {
@param request A WebResourceRequest for the partially loaded content.
@result The filename to use to save a loaded resource.
*/
-- (NSString *)savePathForResponse:(WebResourceResponse *)response
- andRequest:(WebResourceRequest *)request;
+- (NSString *)savePathForResponse:(WebResponse *)response
+ andRequest:(WebRequest *)request;
/*!
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index a989363..bd93471 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -6,8 +6,8 @@
*/
@class WebDataSource;
@class WebPluginError;
- at class WebResourceResponse;
- at class WebResourceRequest;
+ at class WebResponse;
+ at class WebRequest;
/*!
@protocol WebResourceLoadDelegate
@@ -32,7 +32,7 @@
@result An identifier that will be passed back to the implementor for each callback.
The identifier will be retained.
*/
-- identifierForInitialRequest: (WebResourceRequest *)request fromDataSource: (WebDataSource *)dataSource;
+- identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource;
/*!
@method resource:willSendRequest:fromDataSource:
@@ -45,7 +45,7 @@
@result Returns the request, which may be mutated by the implementor, although typically
will be request.
*/
--(WebResourceRequest *)resource:identifier willSendRequest: (WebResourceRequest *)request fromDataSource:(WebDataSource *)dataSource;
+-(WebRequest *)resource:identifier willSendRequest: (WebRequest *)request fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveResponse:fromDataSource:
@@ -55,7 +55,7 @@
@param response The response for the request.
@param dataSource The dataSource that initiated the load.
*/
--(void)resource:identifier didReceiveResponse: (WebResourceResponse *)response fromDataSource:(WebDataSource *)dataSource;
+-(void)resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource;
/*!
@method resource:didReceiveContentLength:fromDataSource:
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index 3e04d95..5a64e5f 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -6,7 +6,7 @@
#import "WebTextRepresentation.h"
#import <WebKit/WebDataSource.h>
-#import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
@implementation WebTextRepresentation
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index a28f428..120f4d2 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/WebResourceResponse.h>
+#import <WebFoundation/WebResponse.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index cd51488..2e0b1db 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -26,7 +26,7 @@
@param request The request to load.
@result The WebController for the WebView in the new window.
*/
-- (WebController *)createWindowWithRequest:(WebResourceRequest *)request;
+- (WebController *)createWindowWithRequest:(WebRequest *)request;
/*!
@method showWindow
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index fd666b5..ae092e3 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -15,7 +15,7 @@
@class WebDownload;
@class WebError;
@class WebFrame;
- at class WebResourceHandle;
+ at class WebResource;
@class WebPreferences;
@class WebView;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 36dc1b6..4c66448 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -31,7 +31,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSUserDefaultsExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResource.h>
static const struct UserAgentSpoofTableEntry *_web_findSpoofTableEntry(const char *, unsigned);
@@ -538,17 +538,17 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
@implementation WebResourceLoadDelegate
-- identifierForInitialRequest: (WebResourceRequest *)request fromDataSource: (WebDataSource *)dataSource
+- identifierForInitialRequest: (WebRequest *)request fromDataSource: (WebDataSource *)dataSource
{
return [[[NSObject alloc] init] autorelease];
}
--(WebResourceRequest *)resource:identifier willSendRequest: (WebResourceRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+-(WebRequest *)resource:identifier willSendRequest: (WebRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
{
return newRequest;
}
--(void)resource:identifier didReceiveResponse: (WebResourceResponse *)response fromDataSource:(WebDataSource *)dataSource
+-(void)resource:identifier didReceiveResponse: (WebResponse *)response fromDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 733fa7b..0670a53 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -65,14 +65,14 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
- (void)_downloadURL:(NSURL *)URL;
- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directoryPath;
-- (BOOL)_defersCallbacks;
-- (void)_setDefersCallbacks:(BOOL)defers;
+- (BOOL)defersCallbacks;
+- (void)setDefersCallbacks:(BOOL)defers;
- (void)_setTopLevelFrameName:(NSString *)name;
- (WebFrame *)_findFrameInThisWindowNamed: (NSString *)name;
- (WebFrame *)_findFrameNamed: (NSString *)name;
-- (WebController *)_openNewWindowWithRequest:(WebResourceRequest *)request behind:(BOOL)behind;
+- (WebController *)_openNewWindowWithRequest:(WebRequest *)request behind:(BOOL)behind;
- (NSMenu *)_menuForElement:(NSDictionary *)element;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index ed91cf6..5f1a234 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -19,13 +19,12 @@
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebCacheLoaderConstants.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResource.h>
+#import <WebFoundation/WebRequest.h>
#import <WebCore/WebCoreSettings.h>
@@ -236,19 +235,19 @@
{
ASSERT(URL);
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebRequest *request = [[WebRequest alloc] initWithURL:URL];
WebFrame *webFrame = [self mainFrame];
[webFrame _downloadRequest:request toDirectory:directory];
[request release];
}
-- (BOOL)_defersCallbacks
+- (BOOL)defersCallbacks
{
return _private->defersCallbacks;
}
-- (void)_setDefersCallbacks:(BOOL)defers
+- (void)setDefersCallbacks:(BOOL)defers
{
if (defers == _private->defersCallbacks) {
return;
@@ -297,7 +296,7 @@
return frame;
}
-- (WebController *)_openNewWindowWithRequest:(WebResourceRequest *)request behind:(BOOL)behind
+- (WebController *)_openNewWindowWithRequest:(WebRequest *)request behind:(BOOL)behind
{
WebController *newWindowController = [[self windowOperationsDelegate] createWindowWithRequest:request];
if (behind) {
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index cd51488..2e0b1db 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -26,7 +26,7 @@
@param request The request to load.
@result The WebController for the WebView in the new window.
*/
-- (WebController *)createWindowWithRequest:(WebResourceRequest *)request;
+- (WebController *)createWindowWithRequest:(WebRequest *)request;
/*!
@method showWindow
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list