[webkit-changes] cvs commit: WebKit/WebView.subproj WebDataSource.m
WebDataSourcePrivate.h WebLoader.h WebLoader.m
WebMainResourceLoader.h WebMainResourceLoader.m
WebBaseResourceHandleDelegate.h
WebBaseResourceHandleDelegate.m WebMainResourceClient.h
WebMainResourceClient.m
Darin
darin at opensource.apple.com
Thu Jun 30 22:20:50 PDT 2005
darin 05/06/30 22:20:50
Modified: . ChangeLog
Misc.subproj WebIconLoader.h
Plugins.subproj WebNetscapePluginStream.h
WebNetscapePluginStream.m
WebCoreSupport.subproj WebBridge.m WebSubresourceLoader.h
WebSubresourceLoader.m
WebKit.pbproj project.pbxproj
WebView.subproj WebDataSource.m WebDataSourcePrivate.h
WebLoader.h WebLoader.m WebMainResourceLoader.h
WebMainResourceLoader.m
Removed: WebCoreSupport.subproj WebSubresourceClient.h
WebSubresourceClient.m
WebView.subproj WebBaseResourceHandleDelegate.h
WebBaseResourceHandleDelegate.m
WebMainResourceClient.h WebMainResourceClient.m
Log:
Reviewed by John Sullivan.
- fixed <http://bugzilla.opendarwin.org/show_bug.cgi?id=3774>
do renaming so that loaders are called "loader", not "client" or "delegate"
* Misc.subproj/WebIconLoader.h:
* Plugins.subproj/WebNetscapePluginStream.h:
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]):
(-[WebNetscapePluginStream start]):
(-[WebNetscapePlugInStreamLoader didFinishLoading]):
(-[WebNetscapePlugInStreamLoader didFailWithError:]):
(-[WebNetscapePlugInStreamLoader cancelWithError:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge startLoadingResource:withURL:customHeaders:]):
(-[WebBridge startLoadingResource:withURL:customHeaders:postData:]):
(-[WebBridge canRunModalNow]):
* WebCoreSupport.subproj/WebSubresourceClient.h: Removed.
* WebCoreSupport.subproj/WebSubresourceClient.m: Removed.
* WebCoreSupport.subproj/WebSubresourceLoader.h:
* WebCoreSupport.subproj/WebSubresourceLoader.m:
(-[WebSubresourceLoader initWithLoader:dataSource:]):
(-[WebSubresourceLoader dealloc]):
(+[WebSubresourceLoader startLoadingResource:withRequest:customHeaders:referrer:forDataSource:]):
(+[WebSubresourceLoader startLoadingResource:withURL:customHeaders:referrer:forDataSource:]):
(+[WebSubresourceLoader startLoadingResource:withURL:customHeaders:postData:referrer:forDataSource:]):
(-[WebSubresourceLoader didReceiveResponse:]):
(-[WebSubresourceLoader didReceiveData:lengthReceived:]):
(-[WebSubresourceLoader didFinishLoading]):
(-[WebSubresourceLoader didFailWithError:]):
(-[WebSubresourceLoader cancel]):
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.h: Removed.
* WebView.subproj/WebBaseResourceHandleDelegate.m: Removed.
* WebView.subproj/WebDataSource.m:
(-[WebDataSourcePrivate dealloc]):
(-[WebDataSource _setLoading:]):
(-[WebDataSource _updateLoading]):
(-[WebDataSource _setPrimaryLoadComplete:]):
(-[WebDataSource _startLoading:]):
(-[WebDataSource _addSubresourceLoader:]):
(-[WebDataSource _removeSubresourceLoader:]):
(-[WebDataSource _addPlugInStreamLoader:]):
(-[WebDataSource _removePlugInStreamLoader:]):
(-[WebDataSource _stopLoadingInternal]):
(-[WebDataSource _defersCallbacksChanged]):
(-[WebDataSource _stopLoadingWithError:]):
(-[WebDataSource data]):
(-[WebDataSource isLoading]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebLoader.h:
* WebView.subproj/WebLoader.m:
* WebView.subproj/WebMainResourceClient.h: Removed.
* WebView.subproj/WebMainResourceClient.m: Removed.
* WebView.subproj/WebMainResourceLoader.h:
* WebView.subproj/WebMainResourceLoader.m:
(-[WebMainResourceLoader didReceiveResponse:]):
Revision Changes Path
1.3209 +60 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3208
retrieving revision 1.3209
diff -u -r1.3208 -r1.3209
--- ChangeLog 30 Jun 2005 01:28:32 -0000 1.3208
+++ ChangeLog 1 Jul 2005 05:20:43 -0000 1.3209
@@ -1,3 +1,63 @@
+2005-06-30 Darin Adler <darin at apple.com>
+
+ Reviewed by John Sullivan.
+
+ - fixed <http://bugzilla.opendarwin.org/show_bug.cgi?id=3774>
+ do renaming so that loaders are called "loader", not "client" or "delegate"
+
+ * Misc.subproj/WebIconLoader.h:
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]):
+ (-[WebNetscapePluginStream start]):
+ (-[WebNetscapePlugInStreamLoader didFinishLoading]):
+ (-[WebNetscapePlugInStreamLoader didFailWithError:]):
+ (-[WebNetscapePlugInStreamLoader cancelWithError:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge startLoadingResource:withURL:customHeaders:]):
+ (-[WebBridge startLoadingResource:withURL:customHeaders:postData:]):
+ (-[WebBridge canRunModalNow]):
+ * WebCoreSupport.subproj/WebSubresourceClient.h: Removed.
+ * WebCoreSupport.subproj/WebSubresourceClient.m: Removed.
+ * WebCoreSupport.subproj/WebSubresourceLoader.h:
+ * WebCoreSupport.subproj/WebSubresourceLoader.m:
+ (-[WebSubresourceLoader initWithLoader:dataSource:]):
+ (-[WebSubresourceLoader dealloc]):
+ (+[WebSubresourceLoader startLoadingResource:withRequest:customHeaders:referrer:forDataSource:]):
+ (+[WebSubresourceLoader startLoadingResource:withURL:customHeaders:referrer:forDataSource:]):
+ (+[WebSubresourceLoader startLoadingResource:withURL:customHeaders:postData:referrer:forDataSource:]):
+ (-[WebSubresourceLoader didReceiveResponse:]):
+ (-[WebSubresourceLoader didReceiveData:lengthReceived:]):
+ (-[WebSubresourceLoader didFinishLoading]):
+ (-[WebSubresourceLoader didFailWithError:]):
+ (-[WebSubresourceLoader cancel]):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h: Removed.
+ * WebView.subproj/WebBaseResourceHandleDelegate.m: Removed.
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSourcePrivate dealloc]):
+ (-[WebDataSource _setLoading:]):
+ (-[WebDataSource _updateLoading]):
+ (-[WebDataSource _setPrimaryLoadComplete:]):
+ (-[WebDataSource _startLoading:]):
+ (-[WebDataSource _addSubresourceLoader:]):
+ (-[WebDataSource _removeSubresourceLoader:]):
+ (-[WebDataSource _addPlugInStreamLoader:]):
+ (-[WebDataSource _removePlugInStreamLoader:]):
+ (-[WebDataSource _stopLoadingInternal]):
+ (-[WebDataSource _defersCallbacksChanged]):
+ (-[WebDataSource _stopLoadingWithError:]):
+ (-[WebDataSource data]):
+ (-[WebDataSource isLoading]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebLoader.h:
+ * WebView.subproj/WebLoader.m:
+ * WebView.subproj/WebMainResourceClient.h: Removed.
+ * WebView.subproj/WebMainResourceClient.m: Removed.
+ * WebView.subproj/WebMainResourceLoader.h:
+ * WebView.subproj/WebMainResourceLoader.m:
+ (-[WebMainResourceLoader didReceiveResponse:]):
+
2005-06-29 David Harrison <harrison at apple.com>
Reviewed by Dave Hyatt (rendering) and Maciej (editing).
1.18 +2 -2 WebKit/Misc.subproj/WebIconLoader.h
Index: WebIconLoader.h
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebIconLoader.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebIconLoader.h 5 Jun 2005 17:54:25 -0000 1.17
+++ WebIconLoader.h 1 Jul 2005 05:20:46 -0000 1.18
@@ -26,14 +26,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKit/WebLoader.h>
@class WebIconLoaderPrivate;
/*!
@class WebIconLoader
*/
- at interface WebIconLoader : WebBaseResourceHandleDelegate
+ at interface WebIconLoader : WebLoader
{
WebIconLoaderPrivate *_private;
}
1.13 +2 -2 WebKit/Plugins.subproj/WebNetscapePluginStream.h
Index: WebNetscapePluginStream.h
===================================================================
RCS file: /cvs/root/WebKit/Plugins.subproj/WebNetscapePluginStream.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebNetscapePluginStream.h 5 Jun 2005 17:54:35 -0000 1.12
+++ WebNetscapePluginStream.h 1 Jul 2005 05:20:46 -0000 1.13
@@ -33,12 +33,12 @@
@class NSURLRequest;
@class NSURLConnection;
- at class WebNetscapePluginConnectionDelegate;
+ at class WebNetscapePlugInStreamLoader;
@interface WebNetscapePluginStream : WebBaseNetscapePluginStream
{
- WebNetscapePluginConnectionDelegate *_loader;
+ WebNetscapePlugInStreamLoader *_loader;
NSURLRequest *request;
}
1.54 +12 -12 WebKit/Plugins.subproj/WebNetscapePluginStream.m
Index: WebNetscapePluginStream.m
===================================================================
RCS file: /cvs/root/WebKit/Plugins.subproj/WebNetscapePluginStream.m,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- WebNetscapePluginStream.m 6 Jun 2005 00:15:09 -0000 1.53
+++ WebNetscapePluginStream.m 1 Jul 2005 05:20:46 -0000 1.54
@@ -28,7 +28,7 @@
#import <WebKit/WebNetscapePluginStream.h>
-#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKit/WebLoader.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebKitErrorsPrivate.h>
@@ -40,7 +40,7 @@
#import <Foundation/NSURLConnection.h>
- at interface WebNetscapePluginConnectionDelegate : WebBaseResourceHandleDelegate
+ at interface WebNetscapePlugInStreamLoader : WebLoader
{
WebNetscapePluginStream *stream;
WebBaseNetscapePluginView *view;
@@ -83,7 +83,7 @@
[(NSMutableURLRequest *)request _web_setHTTPReferrer:nil];
}
- _loader = [[WebNetscapePluginConnectionDelegate alloc] initWithStream:self view:view];
+ _loader = [[WebNetscapePlugInStreamLoader alloc] initWithStream:self view:view];
[_loader setDataSource:[view dataSource]];
isTerminated = NO;
@@ -102,11 +102,11 @@
{
ASSERT(request);
- [[_loader dataSource] _addPlugInStreamClient:_loader];
+ [[_loader dataSource] _addPlugInStreamLoader:_loader];
BOOL succeeded = [_loader loadWithRequest:request];
if (!succeeded) {
- [[_loader dataSource] _removePlugInStreamClient:_loader];
+ [[_loader dataSource] _removePlugInStreamLoader:_loader];
}
}
@@ -124,7 +124,7 @@
@end
- at implementation WebNetscapePluginConnectionDelegate
+ at implementation WebNetscapePlugInStreamLoader
- initWithStream:(WebNetscapePluginStream *)theStream view:(WebBaseNetscapePluginView *)theView
{
@@ -183,10 +183,10 @@
- (void)didFinishLoading
{
- // Calling _removePlugInStreamClient will likely result in a call to release, so we must retain.
+ // Calling _removePlugInStreamLoader will likely result in a call to release, so we must retain.
[self retain];
- [[self dataSource] _removePlugInStreamClient:self];
+ [[self dataSource] _removePlugInStreamLoader:self];
[[view webView] _finishedLoadingResourceFromDataSource:[self dataSource]];
[stream finishedLoadingWithData:[self resourceData]];
[super didFinishLoading];
@@ -196,12 +196,12 @@
- (void)didFailWithError:(NSError *)error
{
- // Calling _removePlugInStreamClient will likely result in a call to release, so we must retain.
+ // Calling _removePlugInStreamLoader will likely result in a call to release, so we must retain.
// The other additional processing can do anything including possibly releasing self;
// one example of this is 3266216
[self retain];
- [[self dataSource] _removePlugInStreamClient:self];
+ [[self dataSource] _removePlugInStreamLoader:self];
[[view webView] _receivedError:error fromDataSource:[self dataSource]];
[stream destroyStreamWithError:error];
[super didFailWithError:error];
@@ -211,10 +211,10 @@
- (void)cancelWithError:(NSError *)error
{
- // Calling _removePlugInStreamClient will likely result in a call to release, so we must retain.
+ // Calling _removePlugInStreamLoader will likely result in a call to release, so we must retain.
[self retain];
- [[self dataSource] _removePlugInStreamClient:self];
+ [[self dataSource] _removePlugInStreamLoader:self];
[super cancelWithError:error];
[self release];
1.356 +5 -5 WebKit/WebCoreSupport.subproj/WebBridge.m
Index: WebBridge.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebBridge.m,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- WebBridge.m 6 Jun 2005 00:15:09 -0000 1.355
+++ WebBridge.m 1 Jul 2005 05:20:46 -0000 1.356
@@ -32,7 +32,7 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebBasePluginPackage.h>
-#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKit/WebLoader.h>
#import "WebControllerSets.h"
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultUIDelegate.h>
@@ -69,7 +69,7 @@
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebResourcePrivate.h>
-#import <WebKit/WebSubresourceClient.h>
+#import <WebKit/WebSubresourceLoader.h>
#import <WebKit/WebViewInternal.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegatePrivate.h>
@@ -450,7 +450,7 @@
BOOL hideReferrer;
[self canLoadURL:URL fromReferrer:[self referrer] hideReferrer:&hideReferrer];
- return [WebSubresourceClient startLoadingResource:resourceLoader
+ return [WebSubresourceLoader startLoadingResource:resourceLoader
withURL:URL
customHeaders:customHeaders
referrer:(hideReferrer ? nil : [self referrer])
@@ -470,7 +470,7 @@
BOOL hideReferrer;
[self canLoadURL:URL fromReferrer:[self referrer] hideReferrer:&hideReferrer];
- return [WebSubresourceClient startLoadingResource:resourceLoader
+ return [WebSubresourceLoader startLoadingResource:resourceLoader
withURL:URL
customHeaders:customHeaders
postData:postData
@@ -1654,7 +1654,7 @@
- (BOOL)canRunModalNow
{
- return [self canRunModal] && ![WebBaseResourceHandleDelegate inConnectionCallback];
+ return [self canRunModal] && ![WebLoader inConnectionCallback];
}
- (void)runModal
1.19 +5 -5 WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
Index: WebSubresourceLoader.h
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WebSubresourceLoader.h 5 Jun 2005 17:54:40 -0000 1.18
+++ WebSubresourceLoader.h 1 Jul 2005 05:20:47 -0000 1.19
@@ -28,25 +28,25 @@
#import <Foundation/Foundation.h>
-#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKit/WebLoader.h>
@class WebDataSource;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
- at interface WebSubresourceClient : WebBaseResourceHandleDelegate <WebCoreResourceHandle>
+ at interface WebSubresourceLoader : WebLoader <WebCoreResourceHandle>
{
- id <WebCoreResourceLoader> loader;
+ id <WebCoreResourceLoader> coreLoader;
}
-+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
++ (WebSubresourceLoader *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withURL:(NSURL *)URL
customHeaders:(NSDictionary *)customHeaders
referrer:(NSString *)referrer
forDataSource:(WebDataSource *)source;
-+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
++ (WebSubresourceLoader *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withURL:(NSURL *)URL
customHeaders:(NSDictionary *)customHeaders
postData:(NSArray *)postData
1.112 +29 -30 WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
Index: WebSubresourceLoader.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- WebSubresourceLoader.m 5 Jun 2005 17:54:40 -0000 1.111
+++ WebSubresourceLoader.m 1 Jul 2005 05:20:47 -0000 1.112
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebSubresourceClient.h>
+#import <WebKit/WebSubresourceLoader.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebBridge.h>
@@ -41,13 +41,13 @@
#import <WebCore/WebCoreResourceLoader.h>
- at implementation WebSubresourceClient
+ at implementation WebSubresourceLoader
- initWithLoader:(id <WebCoreResourceLoader>)l dataSource:(WebDataSource *)s
{
[super init];
- loader = [l retain];
+ coreLoader = [l retain];
[self setDataSource: s];
@@ -56,20 +56,19 @@
- (void)dealloc
{
- [loader release];
+ [coreLoader release];
[super dealloc];
}
-+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
++ (WebSubresourceLoader *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withRequest:(NSMutableURLRequest *)newRequest
customHeaders:(NSDictionary *)customHeaders
referrer:(NSString *)referrer
forDataSource:(WebDataSource *)source
{
- WebSubresourceClient *client = [[[self alloc] initWithLoader:rLoader dataSource:source] autorelease];
+ WebSubresourceLoader *loader = [[[self alloc] initWithLoader:rLoader dataSource:source] autorelease];
- [source _addSubresourceClient:client];
-
+ [source _addSubresourceLoader:loader];
NSEnumerator *e = [customHeaders keyEnumerator];
NSString *key;
@@ -90,27 +89,27 @@
[newRequest setMainDocumentURL:[[[[_webView mainFrame] dataSource] request] URL]];
[newRequest _web_setHTTPUserAgent:[_webView userAgentForURL:[newRequest URL]]];
- if (![client loadWithRequest:newRequest]) {
- client = nil;
+ if (![loader loadWithRequest:newRequest]) {
+ loader = nil;
}
- return client;
+ return loader;
}
-+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
++ (WebSubresourceLoader *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withURL:(NSURL *)URL
customHeaders:(NSDictionary *)customHeaders
referrer:(NSString *)referrer
forDataSource:(WebDataSource *)source
{
NSMutableURLRequest *newRequest = [[NSMutableURLRequest alloc] initWithURL:URL];
- WebSubresourceClient *client = [self startLoadingResource:rLoader withRequest:newRequest customHeaders:customHeaders referrer:referrer forDataSource:source];
+ WebSubresourceLoader *loader = [self startLoadingResource:rLoader withRequest:newRequest customHeaders:customHeaders referrer:referrer forDataSource:source];
[newRequest release];
- return client;
+ return loader;
}
-+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
++ (WebSubresourceLoader *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withURL:(NSURL *)URL
customHeaders:(NSDictionary *)customHeaders
postData:(NSArray *)postData
@@ -122,10 +121,10 @@
[newRequest setHTTPMethod:@"POST"];
webSetHTTPBody(newRequest, postData);
- WebSubresourceClient *client = [self startLoadingResource:rLoader withRequest:newRequest customHeaders:customHeaders referrer:referrer forDataSource:source];
+ WebSubresourceLoader *loader = [self startLoadingResource:rLoader withRequest:newRequest customHeaders:customHeaders referrer:referrer forDataSource:source];
[newRequest release];
- return client;
+ return loader;
}
@@ -140,7 +139,7 @@
NSURLRequest *clientRequest = [super willSendRequest:newRequest redirectResponse:redirectResponse];
if (clientRequest != nil && ![oldURL isEqual:[clientRequest URL]]) {
- [loader redirectedToURL:[clientRequest URL]];
+ [coreLoader redirectedToURL:[clientRequest URL]];
}
return clientRequest;
@@ -155,7 +154,7 @@
// essentially an infinite load and therefore a memory leak. Both this code and code in
// WebMainRecoureClient must be removed once multipart/x-mixed-replace is fully implemented.
if ([[r MIMEType] isEqualToString:@"multipart/x-mixed-replace"]) {
- [dataSource _removeSubresourceClient:self];
+ [dataSource _removeSubresourceLoader:self];
[[[dataSource _webView] mainFrame] _checkLoadComplete];
[self cancelWithError:[NSError _webKitErrorWithDomain:NSURLErrorDomain
code:NSURLErrorUnsupportedURL
@@ -166,7 +165,7 @@
// retain/release self in this delegate method since the additional processing can do
// anything including possibly releasing self; one example of this is 3266216
[self retain];
- [loader receivedResponse:r];
+ [coreLoader receivedResponse:r];
[super didReceiveResponse:r];
[self release];
}
@@ -176,19 +175,19 @@
// retain/release self in this delegate method since the additional processing can do
// anything including possibly releasing self; one example of this is 3266216
[self retain];
- [loader addData:data];
+ [coreLoader addData:data];
[super didReceiveData:data lengthReceived:lengthReceived];
[self release];
}
- (void)didFinishLoading
{
- // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
+ // Calling _removeSubresourceLoader will likely result in a call to release, so we must retain.
[self retain];
- [loader finishWithData:[self resourceData]];
+ [coreLoader finishWithData:[self resourceData]];
- [dataSource _removeSubresourceClient:self];
+ [dataSource _removeSubresourceLoader:self];
[[dataSource _webView] _finishedLoadingResourceFromDataSource:dataSource];
@@ -199,11 +198,11 @@
- (void)didFailWithError:(NSError *)error
{
- // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
+ // Calling _removeSubresourceLoader will likely result in a call to release, so we must retain.
[self retain];
- [loader reportError];
- [dataSource _removeSubresourceClient:self];
+ [coreLoader reportError];
+ [dataSource _removeSubresourceLoader:self];
[self receivedError:error];
[super didFailWithError:error];
@@ -212,11 +211,11 @@
- (void)cancel
{
- // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
+ // Calling _removeSubresourceLoader will likely result in a call to release, so we must retain.
[self retain];
- [loader cancel];
- [dataSource _removeSubresourceClient:self];
+ [coreLoader cancel];
+ [dataSource _removeSubresourceLoader:self];
[self receivedError:[self cancelledError]];
[super cancel];
1.725 +64 -81 WebKit/WebKit.pbproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebKit/WebKit.pbproj/project.pbxproj,v
retrieving revision 1.724
retrieving revision 1.725
diff -u -r1.724 -r1.725
--- project.pbxproj 14 Jun 2005 16:19:16 -0000 1.724
+++ project.pbxproj 1 Jul 2005 05:20:47 -0000 1.725
@@ -538,10 +538,9 @@
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebResourceLoadDelegate.h;
- path = WebView.subproj/WebResourceLoadDelegate.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebResourceLoadDelegate.h;
+ refType = 4;
+ sourceTree = "<group>";
};
51443F9A0429392B00CA2D3A = {
fileEncoding = 30;
@@ -603,46 +602,41 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDefaultContextMenuDelegate.h;
- path = WebView.subproj/WebDefaultContextMenuDelegate.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDefaultContextMenuDelegate.h;
+ refType = 4;
+ sourceTree = "<group>";
};
5152FADE033FC50400CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebDefaultContextMenuDelegate.m;
- path = WebView.subproj/WebDefaultContextMenuDelegate.m;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDefaultContextMenuDelegate.m;
+ refType = 4;
+ sourceTree = "<group>";
};
5152FADF033FC50400CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDefaultPolicyDelegate.h;
- path = WebView.subproj/WebDefaultPolicyDelegate.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDefaultPolicyDelegate.h;
+ refType = 4;
+ sourceTree = "<group>";
};
5152FAE0033FC50400CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebDefaultPolicyDelegate.m;
- path = WebView.subproj/WebDefaultPolicyDelegate.m;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDefaultPolicyDelegate.m;
+ refType = 4;
+ sourceTree = "<group>";
};
5152FAE5033FC52200CA2ACD = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebFrameLoadDelegate.h;
- path = WebView.subproj/WebFrameLoadDelegate.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebFrameLoadDelegate.h;
+ refType = 4;
+ sourceTree = "<group>";
};
515E27CC0458C86500CA2D3A = {
fileEncoding = 30;
@@ -804,8 +798,8 @@
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebBaseResourceHandleDelegate.h;
- path = WebView.subproj/WebBaseResourceHandleDelegate.h;
+ name = WebLoader.h;
+ path = WebView.subproj/WebLoader.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
@@ -813,8 +807,8 @@
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebBaseResourceHandleDelegate.m;
- path = WebView.subproj/WebBaseResourceHandleDelegate.m;
+ name = WebLoader.m;
+ path = WebView.subproj/WebLoader.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
@@ -1115,19 +1109,17 @@
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDataProtocol.h;
- path = WebView.subproj/WebDataProtocol.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDataProtocol.h;
+ refType = 4;
+ sourceTree = "<group>";
};
70ECD6CD043B727400A80181 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebDataProtocol.m;
- path = WebView.subproj/WebDataProtocol.m;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDataProtocol.m;
+ refType = 4;
+ sourceTree = "<group>";
};
//700
//701
@@ -1295,10 +1287,9 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebPluginViewFactoryPrivate.h;
- path = Plugins.subproj/WebPluginViewFactoryPrivate.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebPluginViewFactoryPrivate.h;
+ refType = 4;
+ sourceTree = "<group>";
};
//830
//831
@@ -1338,8 +1329,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDOMOperations.h;
- path = DOM.subproj/WebDOMOperations.h;
+ path = WebDOMOperations.h;
refType = 4;
sourceTree = "<group>";
};
@@ -1347,8 +1337,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebDOMOperations.m;
- path = DOM.subproj/WebDOMOperations.m;
+ path = WebDOMOperations.m;
refType = 4;
sourceTree = "<group>";
};
@@ -1477,8 +1466,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDOMOperationsPrivate.h;
- path = DOM.subproj/WebDOMOperationsPrivate.h;
+ path = WebDOMOperationsPrivate.h;
refType = 4;
sourceTree = "<group>";
};
@@ -1811,7 +1799,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebKit.exp;
- FRAMEWORK_SEARCH_PATHS = "/System/Library/Frameworks/WebKit.framework/Frameworks /System/Library/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks /System/Library/PrivateFrameworks '$(DERIVED_FILE_DIR)'";
+ FRAMEWORK_SEARCH_PATHS = "/System/Library/Frameworks/WebKit.framework/Frameworks /System/Library/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks /System/Library/PrivateFrameworks";
GCC_ENABLE_OBJC_GC = YES;
GCC_FAST_OBJC_DISPATCH = YES;
GCC_OPTIMIZATION_LEVEL = s;
@@ -4832,6 +4820,7 @@
);
isa = PBXGroup;
name = DOM;
+ path = DOM.subproj;
refType = 4;
sourceTree = "<group>";
};
@@ -4839,46 +4828,43 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDOMDocument.h;
- path = DOM.subproj/WebDOMDocument.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDOMDocument.h;
+ refType = 4;
+ sourceTree = "<group>";
};
F57D194D034E734901A80180 = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDOMElement.h;
- path = DOM.subproj/WebDOMElement.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDOMElement.h;
+ refType = 4;
+ sourceTree = "<group>";
};
F57D1951034E734901A80180 = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebDOMNode.h;
- path = DOM.subproj/WebDOMNode.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebDOMNode.h;
+ refType = 4;
+ sourceTree = "<group>";
};
F57FB8C4034E180101A80180 = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = WebDebugDOMNode.h;
- path = WebView.subproj/WebDebugDOMNode.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = ../WebView.subproj/WebDebugDOMNode.h;
+ refType = 4;
+ sourceTree = "<group>";
};
F57FB8C5034E180101A80180 = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = WebDebugDOMNode.m;
- path = WebView.subproj/WebDebugDOMNode.m;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = ../WebView.subproj/WebDebugDOMNode.m;
+ refType = 4;
+ sourceTree = "<group>";
};
F5883BDE025E5C6A01000102 = {
isa = PBXFileReference;
@@ -5076,10 +5062,9 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebTextRenderer.m;
- path = WebCoreSupport.subproj/WebTextRenderer.m;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebTextRenderer.m;
+ refType = 4;
+ sourceTree = "<group>";
};
F5B36B450281DF9C018635CB = {
fileEncoding = 4;
@@ -5150,7 +5135,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- path = WebMainResourceClient.h;
+ path = WebMainResourceLoader.h;
refType = 4;
sourceTree = "<group>";
};
@@ -5158,7 +5143,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- path = WebMainResourceClient.m;
+ path = WebMainResourceLoader.m;
refType = 4;
sourceTree = "<group>";
};
@@ -5182,7 +5167,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- path = WebSubresourceClient.h;
+ path = WebSubresourceLoader.h;
refType = 4;
sourceTree = "<group>";
};
@@ -5190,7 +5175,7 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- path = WebSubresourceClient.m;
+ path = WebSubresourceLoader.m;
refType = 4;
sourceTree = "<group>";
};
@@ -5198,19 +5183,17 @@
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
- name = WebGlyphBuffer.h;
- path = WebCoreSupport.subproj/WebGlyphBuffer.h;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebGlyphBuffer.h;
+ refType = 4;
+ sourceTree = "<group>";
};
F5E7B24603025CE801A80180 = {
fileEncoding = 4;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
- name = WebGlyphBuffer.m;
- path = WebCoreSupport.subproj/WebGlyphBuffer.m;
- refType = 2;
- sourceTree = SOURCE_ROOT;
+ path = WebGlyphBuffer.m;
+ refType = 4;
+ sourceTree = "<group>";
};
F5EBC45202134BB601CA1520 = {
children = (
1.206 +45 -45 WebKit/WebView.subproj/WebDataSource.m
Index: WebDataSource.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSource.m,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- WebDataSource.m 14 Jun 2005 00:25:18 -0000 1.205
+++ WebDataSource.m 1 Jul 2005 05:20:48 -0000 1.206
@@ -52,7 +52,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebKitStatisticsPrivate.h>
-#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebMainResourceLoader.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
#ifndef OMIT_TIGER_FEATURES
@@ -80,9 +80,9 @@
[request release];
[originalRequest release];
[originalRequestCopy release];
- [mainClient release];
- [subresourceClients release];
- [plugInStreamClients release];
+ [mainResourceLoader release];
+ [subresourceLoaders release];
+ [plugInStreamLoaders release];
[pageTitle release];
[response release];
[mainDocumentError release];
@@ -300,7 +300,7 @@
} else {
[_private->webView release];
// FIXME: It would be cleanest to set webView to nil here. Keeping a non-retained reference
- // to the WebView is dangerous. But WebSubresourceClient actually depends on this non-retained
+ // to the WebView is dangerous. But WebSubresourceLoader actually depends on this non-retained
// reference when starting loads after the data source has stoppped loading.
[self release];
}
@@ -308,7 +308,7 @@
- (void)_updateLoading
{
- [self _setLoading:_private->mainClient || [_private->subresourceClients count]];
+ [self _setLoading:_private->mainResourceLoader || [_private->subresourceLoaders count]];
}
- (void)_setWebView: (WebView *)webView
@@ -339,10 +339,10 @@
// there's no callback for that.
[self _loadIcon];
- if (_private->mainClient != nil) {
- [self _setData:[_private->mainClient resourceData]];
- [_private->mainClient release];
- _private->mainClient = nil;
+ if (_private->mainResourceLoader != nil) {
+ [self _setData:[_private->mainResourceLoader resourceData]];
+ [_private->mainResourceLoader release];
+ _private->mainResourceLoader = nil;
}
[self _updateLoading];
@@ -389,7 +389,7 @@
if (pageCache){
_private->loadingFromPageCache = YES;
[self _commitIfReady: pageCache];
- } else if (!_private->mainClient) {
+ } else if (!_private->mainResourceLoader) {
_private->loadingFromPageCache = NO;
id identifier;
@@ -399,46 +399,46 @@
else
identifier = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:_private->webView identifierForInitialRequest:_private->originalRequest fromDataSource:self];
- _private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
- [_private->mainClient setIdentifier: identifier];
+ _private->mainResourceLoader = [[WebMainResourceLoader alloc] initWithDataSource:self];
+ [_private->mainResourceLoader setIdentifier: identifier];
[[self webFrame] _addExtraFieldsToRequest:_private->request alwaysFromRequest: NO];
- if (![_private->mainClient loadWithRequest:_private->request]) {
+ if (![_private->mainResourceLoader loadWithRequest:_private->request]) {
ERROR("could not create WebResourceHandle for URL %@ -- should be caught by policy handler level",
[_private->request URL]);
- [_private->mainClient release];
- _private->mainClient = nil;
+ [_private->mainResourceLoader release];
+ _private->mainResourceLoader = nil;
[self _updateLoading];
}
}
}
-- (void)_addSubresourceClient:(WebBaseResourceHandleDelegate *)client
+- (void)_addSubresourceLoader:(WebLoader *)loader
{
- if (_private->subresourceClients == nil) {
- _private->subresourceClients = [[NSMutableArray alloc] init];
+ if (_private->subresourceLoaders == nil) {
+ _private->subresourceLoaders = [[NSMutableArray alloc] init];
}
- [_private->subresourceClients addObject:client];
+ [_private->subresourceLoaders addObject:loader];
[self _setLoading:YES];
}
-- (void)_removeSubresourceClient:(WebBaseResourceHandleDelegate *)client
+- (void)_removeSubresourceLoader:(WebLoader *)loader
{
- [_private->subresourceClients removeObject:client];
+ [_private->subresourceLoaders removeObject:loader];
[self _updateLoading];
}
-- (void)_addPlugInStreamClient:(WebBaseResourceHandleDelegate *)client
+- (void)_addPlugInStreamLoader:(WebLoader *)loader
{
- if (_private->plugInStreamClients == nil) {
- _private->plugInStreamClients = [[NSMutableArray alloc] init];
+ if (_private->plugInStreamLoaders == nil) {
+ _private->plugInStreamLoaders = [[NSMutableArray alloc] init];
}
- [_private->plugInStreamClients addObject:client];
+ [_private->plugInStreamLoaders addObject:loader];
[self _setLoading:YES];
}
-- (void)_removePlugInStreamClient:(WebBaseResourceHandleDelegate *)client
+- (void)_removePlugInStreamLoader:(WebLoader *)loader
{
- [_private->plugInStreamClients removeObject:client];
+ [_private->plugInStreamLoaders removeObject:loader];
[self _updateLoading];
}
@@ -459,9 +459,9 @@
_private->stopping = YES;
- if(_private->mainClient){
+ if(_private->mainResourceLoader){
// Stop the main handle and let it set the cancelled error.
- [_private->mainClient cancel];
+ [_private->mainResourceLoader cancel];
}else{
// Main handle is already done. Set the cancelled error.
NSError *cancelledError = [NSError _webKitErrorWithDomain:NSURLErrorDomain
@@ -470,9 +470,9 @@
[self _setMainDocumentError:cancelledError];
}
- NSArray *clients = [_private->subresourceClients copy];
- [clients makeObjectsPerformSelector:@selector(cancel)];
- [clients release];
+ NSArray *loaders = [_private->subresourceLoaders copy];
+ [loaders makeObjectsPerformSelector:@selector(cancel)];
+ [loaders release];
if (_private->committed) {
[[self _bridge] stopLoading];
@@ -932,16 +932,16 @@
}
_private->defersCallbacks = defers;
- [_private->mainClient setDefersCallbacks:defers];
+ [_private->mainResourceLoader setDefersCallbacks:defers];
- NSEnumerator *e = [_private->subresourceClients objectEnumerator];
- WebBaseResourceHandleDelegate *client;
- while ((client = [e nextObject])) {
- [client setDefersCallbacks:defers];
- }
- e = [_private->plugInStreamClients objectEnumerator];
- while ((client = [e nextObject])) {
- [client setDefersCallbacks:defers];
+ NSEnumerator *e = [_private->subresourceLoaders objectEnumerator];
+ WebLoader *loader;
+ while ((loader = [e nextObject])) {
+ [loader setDefersCallbacks:defers];
+ }
+ e = [_private->plugInStreamLoaders objectEnumerator];
+ while ((loader = [e nextObject])) {
+ [loader setDefersCallbacks:defers];
}
// It's OK to use the internal version of getting the child
@@ -1028,7 +1028,7 @@
- (void)_stopLoadingWithError:(NSError *)error
{
- [_private->mainClient cancelWithError:error];
+ [_private->mainResourceLoader cancelWithError:error];
}
- (void)_setWebFrame:(WebFrame *)frame
@@ -1112,7 +1112,7 @@
- (NSData *)data
{
- return _private->resourceData != nil ? _private->resourceData : [_private->mainClient resourceData];
+ return _private->resourceData != nil ? _private->resourceData : [_private->mainResourceLoader resourceData];
}
- (id <WebDocumentRepresentation>) representation
@@ -1165,7 +1165,7 @@
if (!_private->primaryLoadComplete && _private->loading) {
return YES;
}
- if ([_private->subresourceClients count]) {
+ if ([_private->subresourceLoaders count]) {
return YES;
}
if (![[[self webFrame] _bridge] doneProcessingData])
1.143 +9 -9 WebKit/WebView.subproj/WebDataSourcePrivate.h
Index: WebDataSourcePrivate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSourcePrivate.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- WebDataSourcePrivate.h 5 Jun 2005 17:54:46 -0000 1.142
+++ WebDataSourcePrivate.h 1 Jul 2005 05:20:48 -0000 1.143
@@ -35,11 +35,11 @@
@class NSURLRequest;
@class NSURLResponse;
@class WebArchive;
- at class WebBaseResourceHandleDelegate;
+ at class WebLoader;
@class WebBridge;
@class WebHistoryItem;
@class WebIconLoader;
- at class WebMainResourceClient;
+ at class WebMainResourceLoader;
@class WebResource;
@class WebView;
@@ -72,11 +72,11 @@
NSURLResponse *response;
// Client for main resource.
- WebMainResourceClient *mainClient;
+ WebMainResourceLoader *mainResourceLoader;
// Clients for other resources.
- NSMutableArray *subresourceClients;
- NSMutableArray *plugInStreamClients;
+ NSMutableArray *subresourceLoaders;
+ NSMutableArray *plugInStreamLoaders;
// The time when the data source was told to start loading.
double loadingStartedTime;
@@ -168,10 +168,10 @@
- (void)_stopLoadingInternal;
- (BOOL)_isStopping;
- (void)_recursiveStopLoading;
-- (void)_addSubresourceClient:(WebBaseResourceHandleDelegate *)client;
-- (void)_removeSubresourceClient:(WebBaseResourceHandleDelegate *)client;
-- (void)_addPlugInStreamClient:(WebBaseResourceHandleDelegate *)client;
-- (void)_removePlugInStreamClient:(WebBaseResourceHandleDelegate *)client;
+- (void)_addSubresourceLoader:(WebLoader *)loader;
+- (void)_removeSubresourceLoader:(WebLoader *)loader;
+- (void)_addPlugInStreamLoader:(WebLoader *)loader;
+- (void)_removePlugInStreamLoader:(WebLoader *)loader;
- (void)_setPrimaryLoadComplete:(BOOL)flag;
- (double)_loadingStartedTime;
- (void)_setTitle:(NSString *)title;
1.43 +2 -2 WebKit/WebView.subproj/WebLoader.h
Index: WebLoader.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebLoader.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- WebLoader.h 5 Jun 2005 17:54:45 -0000 1.42
+++ WebLoader.h 1 Jul 2005 05:20:48 -0000 1.43
@@ -41,7 +41,7 @@
@class WebResource;
@class WebView;
- at interface WebBaseResourceHandleDelegate : NSObject
+ at interface WebLoader : NSObject
{
@protected
WebDataSource *dataSource;
@@ -111,6 +111,6 @@
// Note: This interface can be removed once this method is declared
// in Foundation (probably will be in Foundation-485).
- at interface NSObject (WebBaseResourceHandleDelegateExtras)
+ at interface NSObject (WebLoaderExtras)
- (void)connection:(NSURLConnection *)con didReceiveData:(NSData *)data lengthReceived:(long long)lengthReceived;
@end
1.95 +4 -4 WebKit/WebView.subproj/WebLoader.m
Index: WebLoader.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebLoader.m,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- WebLoader.m 6 Jun 2005 11:12:32 -0000 1.94
+++ WebLoader.m 1 Jul 2005 05:20:48 -0000 1.95
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKit/WebLoader.h>
#import <Foundation/NSURLAuthenticationChallenge.h>
#import <Foundation/NSURLConnection.h>
@@ -55,10 +55,10 @@
- (NSData *)_bufferedData;
@end
- at interface WebBaseResourceHandleDelegate (WebNSURLAuthenticationChallengeSender) <NSURLAuthenticationChallengeSender>
+ at interface WebLoader (WebNSURLAuthenticationChallengeSender) <NSURLAuthenticationChallengeSender>
@end
- at implementation WebBaseResourceHandleDelegate (WebNSURLAuthenticationChallengeSender)
+ at implementation WebLoader (WebNSURLAuthenticationChallengeSender)
- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
@@ -107,7 +107,7 @@
+ (void)_removePropertyForKey:(NSString *)key inRequest:(NSMutableURLRequest *)request;
@end
- at implementation WebBaseResourceHandleDelegate
+ at implementation WebLoader
+ (void)initialize
{
1.52 +2 -2 WebKit/WebView.subproj/WebMainResourceLoader.h
Index: WebMainResourceLoader.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebMainResourceLoader.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- WebMainResourceLoader.h 6 Jun 2005 11:43:50 -0000 1.51
+++ WebMainResourceLoader.h 1 Jul 2005 05:20:49 -0000 1.52
@@ -28,13 +28,13 @@
#import <Foundation/Foundation.h>
-#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKit/WebLoader.h>
#import <WebKitSystemInterface.h>
@class WebPolicyDecisionListener;
@class WebDataSource;
- at interface WebMainResourceClient : WebBaseResourceHandleDelegate
+ at interface WebMainResourceLoader : WebLoader
{
int _contentLength; // for logging only
int _bytesReceived; // for logging only
1.271 +5 -5 WebKit/WebView.subproj/WebMainResourceLoader.m
Index: WebMainResourceLoader.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebMainResourceLoader.m,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- WebMainResourceLoader.m 6 Jun 2005 11:43:50 -0000 1.270
+++ WebMainResourceLoader.m 1 Jul 2005 05:20:49 -0000 1.271
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebMainResourceLoader.h>
#import <Foundation/NSHTTPCookie.h>
#import <Foundation/NSURLConnection.h>
@@ -51,9 +51,9 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebBridge.h>
-// FIXME: More that is in common with WebSubresourceClient should move up into WebBaseResourceHandleDelegate.
+// FIXME: More that is in common with WebSubresourceLoader should move up into WebLoader.
- at implementation WebMainResourceClient
+ at implementation WebMainResourceLoader
- initWithDataSource:(WebDataSource *)ds
{
@@ -317,9 +317,9 @@
// FIXME: Since we're not going to fix <rdar://problem/3087535> for Tiger, we should not
// load multipart/x-mixed-replace content. Pages with such content contain what is
// essentially an infinite load and therefore a memory leak. Both this code and code in
- // SubresourceClient must be removed once multipart/x-mixed-replace is fully implemented.
+ // SubresourceLoader must be removed once multipart/x-mixed-replace is fully implemented.
if ([[r MIMEType] isEqualToString:@"multipart/x-mixed-replace"]) {
- [dataSource _removeSubresourceClient:self];
+ [dataSource _removeSubresourceLoader:self];
[[[dataSource _webView] mainFrame] _checkLoadComplete];
[self cancelWithError:[NSError _webKitErrorWithDomain:NSURLErrorDomain
code:NSURLErrorUnsupportedURL
More information about the webkit-changes
mailing list