[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:32:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2262860a311657f5025c3ed09dc39be3b183ee3c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 27 22:24:31 2003 +0000
Tests:
Reviewed by Darin
Changed WebResource to NSURLConnection. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* HeaderView/DocumentController.m:
* IBViewer/DocumentController.m:
* PDFBundle/PDFView.h:
* PDFBundle/PDFView.m:
(-[PDFResourceDelegate resource:willSendRequest:]):
(-[PDFResourceDelegate resource:didReceiveResponse:]):
(-[PDFResourceDelegate resource:didReceiveData:]):
(-[PDFResourceDelegate resourceDidFinishLoading:]):
(-[PDFResourceDelegate resource:didFailLoadingWithError:]):
(-[PDFView initWithFrame:pageURL:resourceURL:]):
* SimpleViewer/DocumentController.m:
WebFoundation:
Reviewed by Darin
Changed WebResource to NSURLConnection. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* CacheLoader.subproj/NSURLResponse.h:
* CacheLoader.subproj/WebCacheManager.m:
* CacheLoader.subproj/WebProtocol.m:
(-[WebProtocol initWithProtocolClient:request:]):
* CacheLoader.subproj/WebResourceDelegate.h:
* CacheLoader.subproj/WebSynchronousDelegate.h:
* CacheLoader.subproj/WebSynchronousDelegate.m:
(-[WebSynchronousDelegate run:]):
(-[WebSynchronousDelegate resource]):
(-[WebSynchronousDelegate resource:willSendRequest:]):
(-[WebSynchronousDelegate resourceDidFinishLoading:]):
(-[WebSynchronousDelegate resource:didReceiveResponse:]):
(-[WebSynchronousDelegate resource:didReceiveData:]):
* CacheLoader.subproj/WebSynchronousResult.h:
* CookieManager.subproj/WebCookieManager.m:
(runningOnLoadThread):
(-[WebCookieManager _scheduleSetupOnLoadThread]):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebFoundation.h:
* Misc.subproj/WebFoundationLogging.h:
* Misc.subproj/WebFoundationLogging.m:
* Misc.subproj/WebFoundationPrivate.h:
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.h:
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
(-[WebCFNetworkHTTPProtocol deallocateCFNetworkResources]):
(-[WebCFNetworkHTTPProtocol continueBeginLoadInBackgroundAfterCreatingHTTPRequest]):
(-[WebCFNetworkHTTPProtocol addConditionalFieldsToHeader]):
(-[WebCFNetworkHTTPProtocol handleReadStreamEvent:event:]):
* ProtocolHandlers.subproj/WebFTPProtocol.m:
(-[WebFTPProtocol startLoadingWithCacheObject:]):
(-[WebFTPProtocol stopLoading]):
* ProtocolHandlers.subproj/WebFileProtocol.m:
* ProtocolHandlers.subproj/WebSSLProxyWrapperStream.m:
(-[WebSSLProxyWrapperStream cancel]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(WebSimpleHTTPProtocolInit):
* WebFoundation.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by Darin
Changed WebResource to NSURLConnection. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* Downloads.subproj/WebDownload.m:
(-[WebDownload initWithRequest:]):
(-[WebDownload _initWithLoadingResource:request:response:delegate:proxy:]):
(+[WebDownload _downloadWithLoadingResource:request:response:delegate:proxy:]):
(-[WebDownload loadWithDelegate:]):
(-[WebDownload resource:willSendRequest:]):
(-[WebDownload resource:didReceiveResponse:]):
(-[WebDownload resource:didReceiveData:]):
(-[WebDownload resourceDidFinishLoading:]):
(-[WebDownload resource:didFailLoadingWithError:]):
* 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:]):
* Plugins.subproj/WebNetscapePluginStream.h:
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
(-[WebNetscapePluginStream resource:didReceiveResponse:]):
(-[WebNetscapePluginStream resource:didReceiveData:]):
(-[WebNetscapePluginStream resourceDidFinishLoading:]):
(-[WebNetscapePluginStream resource:didFailLoadingWithError:]):
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient resource:willSendRequest:]):
(-[WebSubresourceClient resource:didReceiveResponse:]):
(-[WebSubresourceClient resource:didReceiveData:]):
(-[WebSubresourceClient resourceDidFinishLoading:]):
(-[WebSubresourceClient resource:didFailLoadingWithError:]):
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate loadWithRequest:]):
(-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
(-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
(-[WebBaseResourceHandleDelegate resource:didReceiveData:]):
(-[WebBaseResourceHandleDelegate resourceDidFinishLoading:]):
(-[WebBaseResourceHandleDelegate resource:didFailLoadingWithError:]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _continueAfterNavigationPolicy:]):
(-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient resource:willSendRequest:]):
(-[WebMainResourceClient resource:didReceiveResponse:]):
(-[WebMainResourceClient resource:didReceiveData:]):
(-[WebMainResourceClient resourceDidFinishLoading:]):
(-[WebMainResourceClient resource:didFailLoadingWithError:]):
(-[WebResourceDelegateProxy setDelegate:]):
(-[WebResourceDelegateProxy resource:willSendRequest:]):
(-[WebResourceDelegateProxy resource:didReceiveResponse:]):
(-[WebResourceDelegateProxy resource:didReceiveData:]):
(-[WebResourceDelegateProxy resourceDidFinishLoading:]):
(-[WebResourceDelegateProxy resource:didFailLoadingWithError:]):
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.m:
WebBrowser:
Reviewed by Darin
Changed WebResource to NSURLConnection. Some other "supporting" names
changed as well. Note that there are no functional modifications,
only name changes.
* BrowserWebController.m:
(-[BrowserWebController decidePolicyForAction:andRequest:inFrame:newFrameName:decisionListener:]):
* BugReportController.h:
* BugReportController.m:
(-[BugReportController sendBugReportToAppleWithScreenShot:source:]):
(-[BugReportController resource:willSendRequest:]):
(-[BugReportController resource:didReceiveResponse:]):
(-[BugReportController resource:didReceiveData:]):
(-[BugReportController resourceDidFinishLoading:]):
(-[BugReportController resource:didFailLoadingWithError:]):
* ContextMenuHandler.m:
(-[ContextMenuHandler webView:contextMenuItemsForElement:defaultMenuItems:]):
* DownloadMonitor.m:
* LoadProgressMonitor.h:
* LoadProgressMonitor.m:
* LocationChangeError.m:
(-[LocationChangeHandler specializedMessageForError:]):
* Test/PageLoadTestRunner.m:
(-[PageLoadTestRunner startTest]):
(-[PageLoadTestRunner stop]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ef40c55..242458e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,81 @@
+2003-03-27 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Darin
+
+ Changed WebResource to NSURLConnection. Some other "supporting" names
+ changed as well. Note that there are no functional modifications,
+ only name changes.
+
+ * Downloads.subproj/WebDownload.m:
+ (-[WebDownload initWithRequest:]):
+ (-[WebDownload _initWithLoadingResource:request:response:delegate:proxy:]):
+ (+[WebDownload _downloadWithLoadingResource:request:response:delegate:proxy:]):
+ (-[WebDownload loadWithDelegate:]):
+ (-[WebDownload resource:willSendRequest:]):
+ (-[WebDownload resource:didReceiveResponse:]):
+ (-[WebDownload resource:didReceiveData:]):
+ (-[WebDownload resourceDidFinishLoading:]):
+ (-[WebDownload resource:didFailLoadingWithError:]):
+ * 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:]):
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+ (-[WebNetscapePluginStream resource:didReceiveResponse:]):
+ (-[WebNetscapePluginStream resource:didReceiveData:]):
+ (-[WebNetscapePluginStream resourceDidFinishLoading:]):
+ (-[WebNetscapePluginStream resource:didFailLoadingWithError:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient resource:willSendRequest:]):
+ (-[WebSubresourceClient resource:didReceiveResponse:]):
+ (-[WebSubresourceClient resource:didReceiveData:]):
+ (-[WebSubresourceClient resourceDidFinishLoading:]):
+ (-[WebSubresourceClient resource:didFailLoadingWithError:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate loadWithRequest:]):
+ (-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
+ (-[WebBaseResourceHandleDelegate resource:didReceiveResponse:]):
+ (-[WebBaseResourceHandleDelegate resource:didReceiveData:]):
+ (-[WebBaseResourceHandleDelegate resourceDidFinishLoading:]):
+ (-[WebBaseResourceHandleDelegate resource:didFailLoadingWithError:]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterNavigationPolicy:]):
+ (-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient resource:willSendRequest:]):
+ (-[WebMainResourceClient resource:didReceiveResponse:]):
+ (-[WebMainResourceClient resource:didReceiveData:]):
+ (-[WebMainResourceClient resourceDidFinishLoading:]):
+ (-[WebMainResourceClient resource:didFailLoadingWithError:]):
+ (-[WebResourceDelegateProxy setDelegate:]):
+ (-[WebResourceDelegateProxy resource:willSendRequest:]):
+ (-[WebResourceDelegateProxy resource:didReceiveResponse:]):
+ (-[WebResourceDelegateProxy resource:didReceiveData:]):
+ (-[WebResourceDelegateProxy resourceDidFinishLoading:]):
+ (-[WebResourceDelegateProxy resource:didFailLoadingWithError:]):
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.m:
+
2003-03-27 Richard Williamson <rjw at apple.com>
API change: WebHistory initWithFile: -> initWithContentsOfURL:
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 569d0ea..d0fc5f6 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -22,7 +22,7 @@
#import <WebFoundation/WebNSFileManagerExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
@@ -55,7 +55,7 @@ typedef struct WebFSRefParam
BOOL areWritesCancelled;
BOOL encounteredCloseError;
- WebResource *resource;
+ NSURLConnection *resource;
NSURLRequest *request;
NSURLResponse *response;
WebResourceDelegateProxy *proxy;
@@ -168,7 +168,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
_private = [[WebDownloadPrivate alloc] init];
_private->request = [request retain];
- _private->resource = [[WebResource alloc] initWithRequest:request];
+ _private->resource = [[NSURLConnection alloc] initWithRequest:request];
if (!_private->resource) {
[self release];
return nil;
@@ -177,7 +177,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return self;
}
-- _initWithLoadingResource:(WebResource *)resource
+- _initWithLoadingResource:(NSURLConnection *)resource
request:(NSURLRequest *)request
response:(NSURLResponse *)response
delegate:(id)delegate
@@ -193,7 +193,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
_private->response = [response retain];
_private->proxy = [proxy retain];
[self _setDelegate:delegate];
- [_private->proxy setDelegate:(id <WebResourceDelegate>)self];
+ [_private->proxy setDelegate:(id <NSURLConnectionDelegate>)self];
// Replay the delegate methods that would be called in the standalone download case.
if ([_private->delegate respondsToSelector:@selector(download:didStartFromRequest:)]) {
@@ -209,12 +209,12 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
[self _setRequest:request];
[self _setResponse:nil];
[_private->resource release];
- _private->resource = [[WebResource alloc] initWithRequest:request];
+ _private->resource = [[NSURLConnection alloc] initWithRequest:request];
if (!_private->resource) {
[self release];
return nil;
}
- [_private->resource loadWithDelegate:(id <WebResourceDelegate>)self];
+ [_private->resource loadWithDelegate:(id <NSURLConnectionDelegate>)self];
[self _downloadStarted];
}
return self;
@@ -228,7 +228,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return self;
}
-+ _downloadWithLoadingResource:(WebResource *)resource
++ _downloadWithLoadingResource:(NSURLConnection *)resource
request:(NSURLRequest *)request
response:(NSURLResponse *)response
delegate:(id)delegate
@@ -253,7 +253,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
[self _downloadStarted];
[self _setDelegate:delegate];
- [_private->resource loadWithDelegate:(id <WebResourceDelegate>)self];
+ [_private->resource loadWithDelegate:(id <NSURLConnectionDelegate>)self];
if ([_private->delegate respondsToSelector:@selector(download:didStartFromRequest:)]) {
[_private->delegate download:self didStartFromRequest:_private->request];
@@ -320,7 +320,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
--(NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)theRequest
+-(NSURLRequest *)resource:(NSURLConnection *)resource willSendRequest:(NSURLRequest *)theRequest
{
NSURLRequest *request = nil;
@@ -339,7 +339,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return request;
}
--(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)response
+-(void)resource:(NSURLConnection *)resource didReceiveResponse:(NSURLResponse *)response
{
[self _setResponse:response];
@@ -348,7 +348,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
--(void)resource:(WebResource *)resource didReceiveData:(NSData *)data
+-(void)resource:(NSURLConnection *)resource didReceiveData:(NSData *)data
{
if ([_private->delegate respondsToSelector:@selector(download:didReceiveDataOfLength:)]) {
[_private->delegate download:self didReceiveDataOfLength:[data length]];
@@ -360,7 +360,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
--(void)resourceDidFinishLoading:(WebResource *)resource
+-(void)resourceDidFinishLoading:(NSURLConnection *)resource
{
WebError *error = [self _decodeData:_private->bufferedData];
[_private->bufferedData release];
@@ -379,7 +379,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
[self _closeFileAsync];
}
--(void)resource:(WebResource *)resource didFailLoadingWithError:(WebError *)error
+-(void)resource:(NSURLConnection *)resource didFailLoadingWithError:(WebError *)error
{
[self _cancelWithError:error];
}
diff --git a/WebKit/Downloads.subproj/WebDownloadPrivate.h b/WebKit/Downloads.subproj/WebDownloadPrivate.h
index e5c9893..931dcc2 100644
--- a/WebKit/Downloads.subproj/WebDownloadPrivate.h
+++ b/WebKit/Downloads.subproj/WebDownloadPrivate.h
@@ -8,12 +8,12 @@
#import <WebKit/WebDownload.h>
@class NSURLRequest;
- at class WebResource;
+ at class NSURLConnection;
@class NSURLResponse;
@class WebResourceDelegateProxy;
@interface WebDownload (WebPrivate)
-+ _downloadWithLoadingResource:(WebResource *)resource
++ _downloadWithLoadingResource:(NSURLConnection *)resource
request:(NSURLRequest *)request
response:(NSURLResponse *)response
delegate:(id)delegate
diff --git a/WebKit/Misc.subproj/WebIconLoader.h b/WebKit/Misc.subproj/WebIconLoader.h
index 909d8be..9c7964f 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 WebResourceDelegate;
+ at protocol NSURLConnectionDelegate;
/*!
@class WebIconLoader
*/
- at interface WebIconLoader : NSObject <WebResourceDelegate>
+ at interface WebIconLoader : NSObject <NSURLConnectionDelegate>
{
WebIconLoaderPrivate *_private;
}
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 6db6cf4..61dc131 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -12,7 +12,7 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
@@ -22,7 +22,7 @@
@interface WebIconLoaderPrivate : NSObject
{
@public
- WebResource *handle;
+ NSURLConnection *handle;
id delegate;
NSURL *URL;
NSMutableData *resourceData;
@@ -87,7 +87,7 @@
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:_private->URL];
[request HTTPSetPageNotFoundCacheLifetime:WebIconLoaderWeeksWorthOfSeconds];
- _private->handle = [[WebResource alloc] initWithRequest:request];
+ _private->handle = [[NSURLConnection alloc] initWithRequest:request];
[_private->handle loadWithDelegate:self];
[request release];
}
@@ -99,7 +99,7 @@
_private->handle = nil;
}
-- (void)resourceDidFinishLoading:(WebResource *)sender
+- (void)resourceDidFinishLoading:(NSURLConnection *)sender
{
NSImage *icon = [[NSImage alloc] initWithData:_private->resourceData];
if (icon) {
@@ -109,22 +109,22 @@
}
}
--(NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)request
+-(NSURLRequest *)resource:(NSURLConnection *)resource willSendRequest:(NSURLRequest *)request
{
return request;
}
--(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)theResponse
+-(void)resource:(NSURLConnection *)resource didReceiveResponse:(NSURLResponse *)theResponse
{
// no-op
}
-- (void)resource:(WebResource *)sender didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)sender didReceiveData:(NSData *)data
{
[_private->resourceData appendData:data];
}
-- (void)resource:(WebResource *)sender didFailLoadingWithError:(WebError *)result
+- (void)resource:(NSURLConnection *)sender didFailLoadingWithError:(WebError *)result
{
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
index b9f0c41..c1e124c 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -9,7 +9,7 @@
#import <WebKit/WebBaseNetscapePluginStream.h>
@class WebNetscapePluginEmbeddedView;
- at class WebResource;
+ at class NSURLConnection;
@class NSURLRequest;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 8b3dbd2..547efcb 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -11,7 +11,7 @@
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
@implementation WebNetscapePluginStream
@@ -21,7 +21,7 @@
{
[super init];
- if(!theRequest || !thePluginPointer || ![WebResource canInitWithRequest:theRequest]){
+ if(!theRequest || !thePluginPointer || ![NSURLConnection canInitWithRequest:theRequest]){
return nil;
}
@@ -74,13 +74,13 @@
}
}
-- (void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)theResponse
+- (void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)theResponse
{
[self setResponse:theResponse];
[super resource:h didReceiveResponse:theResponse];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
if (transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
[resourceData appendData:data];
@@ -91,7 +91,7 @@
[super resource:h didReceiveData:data];
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
[[view controller] _finishedLoadingResourceFromDataSource:[view dataSource]];
[self finishedLoadingWithData:resourceData];
@@ -102,7 +102,7 @@
[super resourceDidFinishLoading: h];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)result
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)result
{
[[view controller] _receivedError:result fromDataSource:[view dataSource]];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index c528d3f..c0d82d2 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -48,7 +48,7 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebSystemBits.h>
#import <WebFoundation/WebFileTypeMappings.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 7606ba5..251498c 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -12,7 +12,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebResourceDelegate.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
@@ -78,7 +78,7 @@
[[dataSource _controller] _receivedError:error fromDataSource:dataSource];
}
--(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
+-(NSURLRequest *)resource:(NSURLConnection *)h willSendRequest:(NSURLRequest *)newRequest
{
// FIXME: We do want to tell the client about redirects for subresources.
// But the current API doesn't give any way to tell redirects on
@@ -91,20 +91,20 @@
return [super resource: h willSendRequest: newRequest];
}
--(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
+-(void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(r);
[loader receivedResponse:r];
[super resource:h didReceiveResponse:r];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
[loader addData:data];
[super resource:h didReceiveData:data];
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -120,7 +120,7 @@
[super resourceDidFinishLoading:h];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 7606ba5..251498c 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -12,7 +12,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebResourceDelegate.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
@@ -78,7 +78,7 @@
[[dataSource _controller] _receivedError:error fromDataSource:dataSource];
}
--(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
+-(NSURLRequest *)resource:(NSURLConnection *)h willSendRequest:(NSURLRequest *)newRequest
{
// FIXME: We do want to tell the client about redirects for subresources.
// But the current API doesn't give any way to tell redirects on
@@ -91,20 +91,20 @@
return [super resource: h willSendRequest: newRequest];
}
--(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
+-(void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(r);
[loader receivedResponse:r];
[super resource:h didReceiveResponse:r];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
[loader addData:data];
[super resource:h didReceiveData:data];
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
@@ -120,7 +120,7 @@
[super resourceDidFinishLoading:h];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index e1e7526..92f8dd4 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -8,17 +8,17 @@
@class WebView;
@class WebDataSource;
@class WebError;
- at class WebResource;
+ at class NSURLConnection;
@class NSURLRequest;
@class NSURLResponse;
- at protocol WebResourceDelegate;
+ at protocol NSURLConnectionDelegate;
- at interface WebBaseResourceHandleDelegate : NSObject <WebResourceDelegate>
+ at interface WebBaseResourceHandleDelegate : NSObject <NSURLConnectionDelegate>
{
@protected
WebDataSource *dataSource;
- WebResource *resource;
+ NSURLConnection *resource;
NSURLRequest *request;
@private
WebView *controller;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index bc00912..b86b1fe 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -8,7 +8,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
@@ -72,7 +72,7 @@
{
ASSERT(resource == nil);
- resource = [[WebResource alloc] initWithRequest:r];
+ resource = [[NSURLConnection alloc] initWithRequest:r];
if (!resource) {
return NO;
}
@@ -130,7 +130,7 @@
return downloadDelegate;
}
--(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
+-(NSURLRequest *)resource:(NSURLConnection *)h willSendRequest:(NSURLRequest *)newRequest
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -179,7 +179,7 @@
return request;
}
--(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
+-(void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -192,7 +192,7 @@
[[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveResponse:r fromDataSource:dataSource];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -200,7 +200,7 @@
[[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -213,7 +213,7 @@
[self _releaseResources];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)result
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)result
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 96b83a5..b56436c 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -10,7 +10,7 @@
@class WebDataSourcePrivate;
@class WebError;
@class WebFrame;
- at class WebResource;
+ at class NSURLConnection;
@class NSURLRequest;
@class NSMutableURLRequest;
@class NSURLResponse;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 83422b9..04e569c 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -16,7 +16,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 8b46021..a3822dd 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -33,7 +33,7 @@
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 707bfe2..cd413b3 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -17,7 +17,7 @@
#import <WebFoundation/WebLocalizableStrings.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
@@ -106,7 +106,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
linkURL = [element objectForKey:WebElementLinkURLKey];
if (linkURL) {
- if([WebResource canInitWithRequest:[NSURLRequest requestWithURL:linkURL]]){
+ if([NSURLConnection canInitWithRequest:[NSURLRequest requestWithURL:linkURL]]){
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenLinkInNewWindow]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagDownloadLinkToDisk]];
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopyLinkToClipboard]];
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index c6398f7..4951bbd 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -8,7 +8,7 @@
#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebView.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebAssertions.h>
@@ -62,7 +62,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
inFrame:(WebFrame *)frame
decisionListener:(WebPolicyDecisionListener *)listener
{
- if ([WebResource canInitWithRequest:request]) {
+ if ([NSURLConnection canInitWithRequest:request]) {
[listener use];
} else {
// A file URL shouldn't fall through to here, but if it did,
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index aea2a32..ee89173 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -5,7 +5,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebDataSource.h>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9c09ca6..0c8afc6 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -30,7 +30,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
@@ -1430,7 +1430,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[[self webView] _downloadURL:[request URL]];
break;
case WebPolicyUse:
- if (![WebResource canInitWithRequest:request]) {
+ if (![NSURLConnection canInitWithRequest:request]) {
[self _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowURL forURL:[request URL]];
} else {
shouldContinue = YES;
@@ -1649,7 +1649,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_postWithURL:(NSURL *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values
{
- // When posting, use the WebResourceHandleFlagLoadFromOrigin load flag.
+ // When posting, use the NSURLRequestReloadIgnoringCacheData 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.
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index e1e7526..92f8dd4 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -8,17 +8,17 @@
@class WebView;
@class WebDataSource;
@class WebError;
- at class WebResource;
+ at class NSURLConnection;
@class NSURLRequest;
@class NSURLResponse;
- at protocol WebResourceDelegate;
+ at protocol NSURLConnectionDelegate;
- at interface WebBaseResourceHandleDelegate : NSObject <WebResourceDelegate>
+ at interface WebBaseResourceHandleDelegate : NSObject <NSURLConnectionDelegate>
{
@protected
WebDataSource *dataSource;
- WebResource *resource;
+ NSURLConnection *resource;
NSURLRequest *request;
@private
WebView *controller;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index bc00912..b86b1fe 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -8,7 +8,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
@@ -72,7 +72,7 @@
{
ASSERT(resource == nil);
- resource = [[WebResource alloc] initWithRequest:r];
+ resource = [[NSURLConnection alloc] initWithRequest:r];
if (!resource) {
return NO;
}
@@ -130,7 +130,7 @@
return downloadDelegate;
}
--(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
+-(NSURLRequest *)resource:(NSURLConnection *)h willSendRequest:(NSURLRequest *)newRequest
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -179,7 +179,7 @@
return request;
}
--(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
+-(void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -192,7 +192,7 @@
[[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveResponse:r fromDataSource:dataSource];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -200,7 +200,7 @@
[[controller _resourceLoadDelegateForwarder] webView:controller resource:identifier didReceiveContentLength:[data length] fromDataSource:dataSource];
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
@@ -213,7 +213,7 @@
[self _releaseResources];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)result
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)result
{
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index f626175..43c255e 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -13,11 +13,11 @@
@class WebPolicyDecisionListener;
@class WebDataSource;
- at interface WebResourceDelegateProxy : NSObject <WebResourceDelegate>
+ at interface WebResourceDelegateProxy : NSObject <NSURLConnectionDelegate>
{
- id <WebResourceDelegate> delegate;
+ id <NSURLConnectionDelegate> delegate;
}
-- (void)setDelegate:(id <WebResourceDelegate>)theDelegate;
+- (void)setDelegate:(id <NSURLConnectionDelegate>)theDelegate;
@end
@interface WebMainResourceClient : WebBaseResourceHandleDelegate
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index bc62a27..309c4af 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -10,7 +10,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
@@ -101,7 +101,7 @@
}
}
--(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
+-(NSURLRequest *)resource:(NSURLConnection *)h willSendRequest:(NSURLRequest *)newRequest
{
// Note that there are no asserts here as there are for the other callbacks. This is due to the
// fact that this "callback" is sent when starting every load, and the state of callback
@@ -202,7 +202,7 @@
}
--(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
+-(void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -217,7 +217,7 @@
[self checkContentPolicyForResponse:r];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
ASSERT(data);
ASSERT([data length] != 0);
@@ -238,7 +238,7 @@
LOG(Loading, "%d of %d", _bytesReceived, _contentLength);
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -258,7 +258,7 @@
[self release];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)error
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -297,36 +297,36 @@
@implementation WebResourceDelegateProxy
-- (void)setDelegate:(id <WebResourceDelegate>)theDelegate
+- (void)setDelegate:(id <NSURLConnectionDelegate>)theDelegate
{
delegate = theDelegate;
}
-- (NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)request
+- (NSURLRequest *)resource:(NSURLConnection *)resource willSendRequest:(NSURLRequest *)request
{
ASSERT(delegate);
return [delegate resource:resource willSendRequest:request];
}
--(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)response
+-(void)resource:(NSURLConnection *)resource didReceiveResponse:(NSURLResponse *)response
{
ASSERT(delegate);
[delegate resource:resource didReceiveResponse:response];
}
--(void)resource:(WebResource *)resource didReceiveData:(NSData *)data
+-(void)resource:(NSURLConnection *)resource didReceiveData:(NSData *)data
{
ASSERT(delegate);
[delegate resource:resource didReceiveData:data];
}
--(void)resourceDidFinishLoading:(WebResource *)resource
+-(void)resourceDidFinishLoading:(NSURLConnection *)resource
{
ASSERT(delegate);
[delegate resourceDidFinishLoading:resource];
}
--(void)resource:(WebResource *)resource didFailLoadingWithError:(WebError *)error
+-(void)resource:(NSURLConnection *)resource didFailLoadingWithError:(WebError *)error
{
ASSERT(delegate);
[delegate resource:resource didFailLoadingWithError:error];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index f626175..43c255e 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -13,11 +13,11 @@
@class WebPolicyDecisionListener;
@class WebDataSource;
- at interface WebResourceDelegateProxy : NSObject <WebResourceDelegate>
+ at interface WebResourceDelegateProxy : NSObject <NSURLConnectionDelegate>
{
- id <WebResourceDelegate> delegate;
+ id <NSURLConnectionDelegate> delegate;
}
-- (void)setDelegate:(id <WebResourceDelegate>)theDelegate;
+- (void)setDelegate:(id <NSURLConnectionDelegate>)theDelegate;
@end
@interface WebMainResourceClient : WebBaseResourceHandleDelegate
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index bc62a27..309c4af 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -10,7 +10,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
@@ -101,7 +101,7 @@
}
}
--(NSURLRequest *)resource:(WebResource *)h willSendRequest:(NSURLRequest *)newRequest
+-(NSURLRequest *)resource:(NSURLConnection *)h willSendRequest:(NSURLRequest *)newRequest
{
// Note that there are no asserts here as there are for the other callbacks. This is due to the
// fact that this "callback" is sent when starting every load, and the state of callback
@@ -202,7 +202,7 @@
}
--(void)resource:(WebResource *)h didReceiveResponse:(NSURLResponse *)r
+-(void)resource:(NSURLConnection *)h didReceiveResponse:(NSURLResponse *)r
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -217,7 +217,7 @@
[self checkContentPolicyForResponse:r];
}
-- (void)resource:(WebResource *)h didReceiveData:(NSData *)data
+- (void)resource:(NSURLConnection *)h didReceiveData:(NSData *)data
{
ASSERT(data);
ASSERT([data length] != 0);
@@ -238,7 +238,7 @@
LOG(Loading, "%d of %d", _bytesReceived, _contentLength);
}
-- (void)resourceDidFinishLoading:(WebResource *)h
+- (void)resourceDidFinishLoading:(NSURLConnection *)h
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -258,7 +258,7 @@
[self release];
}
-- (void)resource:(WebResource *)h didFailLoadingWithError:(WebError *)error
+- (void)resource:(NSURLConnection *)h didFailLoadingWithError:(WebError *)error
{
ASSERT(![h defersCallbacks]);
ASSERT(![self defersCallbacks]);
@@ -297,36 +297,36 @@
@implementation WebResourceDelegateProxy
-- (void)setDelegate:(id <WebResourceDelegate>)theDelegate
+- (void)setDelegate:(id <NSURLConnectionDelegate>)theDelegate
{
delegate = theDelegate;
}
-- (NSURLRequest *)resource:(WebResource *)resource willSendRequest:(NSURLRequest *)request
+- (NSURLRequest *)resource:(NSURLConnection *)resource willSendRequest:(NSURLRequest *)request
{
ASSERT(delegate);
return [delegate resource:resource willSendRequest:request];
}
--(void)resource:(WebResource *)resource didReceiveResponse:(NSURLResponse *)response
+-(void)resource:(NSURLConnection *)resource didReceiveResponse:(NSURLResponse *)response
{
ASSERT(delegate);
[delegate resource:resource didReceiveResponse:response];
}
--(void)resource:(WebResource *)resource didReceiveData:(NSData *)data
+-(void)resource:(NSURLConnection *)resource didReceiveData:(NSData *)data
{
ASSERT(delegate);
[delegate resource:resource didReceiveData:data];
}
--(void)resourceDidFinishLoading:(WebResource *)resource
+-(void)resourceDidFinishLoading:(NSURLConnection *)resource
{
ASSERT(delegate);
[delegate resourceDidFinishLoading:resource];
}
--(void)resource:(WebResource *)resource didFailLoadingWithError:(WebError *)error
+-(void)resource:(NSURLConnection *)resource didFailLoadingWithError:(WebError *)error
{
ASSERT(delegate);
[delegate resource:resource didFailLoadingWithError:error];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index abc15c2..489b023 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -157,7 +157,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@method decideContentPolicyForMIMEType:andRequest:inFrame:
@discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted.
@param type MIME type for the resource.
- @param request A WebResourceRequest for the partially loaded content.
+ @param request A NSURLRequest for the partially loaded content.
@param frame The frame which is loading the URL.
@param listener The object to call when the decision is made
*/
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 1f0d4ae..c1f5c7d 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -14,7 +14,7 @@
@class WebDownload;
@class WebError;
@class WebFrame;
- at class WebResource;
+ at class NSURLConnection;
@class WebPreferences;
@class WebFrameView;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index ab9ea01..d39dd9b 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -29,7 +29,7 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSUserDefaultsExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
static const struct UserAgentSpoofTableEntry *_web_findSpoofTableEntry(const char *, unsigned);
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 725a386..fbdde33 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -29,7 +29,7 @@
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebResource.h>
+#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebCore/WebCoreSettings.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list