[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 06:44:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b9ca34302dab3797af3c2fc4e167398268083fe2
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 25 13:25:58 2002 +0000
WebFoundation:
Begin change from WebResourceClient to WebResourceHandleDelegate.
In this step, I have just changed the name of the protocol; the
protocol interface is the same.
As part of this change, WebResourceSynchronousClient becomes
WebResourceHandleSynchronousDelegate. Also, the init interface
for WebResourceHandle assumes the form specified in the new API
specification:
-(id)initWithRequest:(WebResourceRequest *)request delegate:(id <WebResourceHandleDelegate>)delegate;
I also made cosmetic changes to variable names and such.
Note that I am removing the WebResourceClient.h file, but I
copied the ,v file in the repository so that the history for WebResourceClient.h
is preserved in WebResourceHandleDelegate.h.
* CacheLoader.subproj/WebResourceCallbackClient.h:
* CacheLoader.subproj/WebResourceClient.h: Removed.
* CacheLoader.subproj/WebResourceHandle.h:
* CacheLoader.subproj/WebResourceHandle.m:
(-[WebResourceHandle loadInForeground:])
(-[WebResourceHandle initWithRequest:delegate:])
* CacheLoader.subproj/WebResourceHandleInternal.h:
* CacheLoader.subproj/WebResourceHandleInternal.m:
(-[WebResourceHandleInstanceVariables dealloc])
(-[WebResourceHandle _notifyClientDidRedirectToURL])
(-[WebResourceHandle _notifyClientDataDidBecomeAvailable])
(-[WebResourceHandle _notifyClientDidFailLoading])
(-[WebResourceHandle _notifyClientDidFinishLoading])
* CacheLoader.subproj/WebResourceHandlePrivate.m:
(-[WebResourceHandle _userAgentForURL:])
* CacheLoader.subproj/WebResourceResponse.h:
* CacheLoader.subproj/WebResourceSynchronousClient.h:
* CacheLoader.subproj/WebResourceSynchronousClient.m:
(-[WebResourceHandleSynchronousDelegate initWithMonitor:realDelegate:])
(-[WebResourceHandleSynchronousDelegate dealloc])
(-[WebResourceHandleSynchronousDelegate handleWillUseUserAgent:forURL:])
(-[WebResourceHandleSynchronousDelegate handleDidFinishLoading:])
(-[WebResourceHandleSynchronousDelegate handleDidReceiveData:data:])
(-[WebResourceHandleSynchronousDelegate handleDidRedirect:toURL:])
* Misc.subproj/WebFoundation.h:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Begin change from WebResourceClient to WebResourceHandleDelegate.
In this step, I have just changed the name of the protocol; the
protocol interface is the same.
I made other cosmetic changes to variable names and such.
* Misc.subproj/WebIconLoader.h:
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading])
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream startLoad])
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge objectLoadedFromCache:size:])
* WebCoreSupport.subproj/WebSubresourceClient.h:
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading])
* WebView.subproj/WebMainResourceClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2159 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d0cf578..6c42a39 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2002-09-25 Ken Kocienda <kocienda at apple.com>
+
+ Begin change from WebResourceClient to WebResourceHandleDelegate.
+ In this step, I have just changed the name of the protocol; the
+ protocol interface is the same.
+
+ I made other cosmetic changes to variable names and such.
+
+ * Misc.subproj/WebIconLoader.h:
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading])
+ * WebView.subproj/WebMainResourceClient.h:
+
2002-09-25 Maciej Stachowiak <mjs at apple.com>
- fixed 2854536 - New cookie policy: "accept cookies only from the
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d0cf578..6c42a39 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,25 @@
+2002-09-25 Ken Kocienda <kocienda at apple.com>
+
+ Begin change from WebResourceClient to WebResourceHandleDelegate.
+ In this step, I have just changed the name of the protocol; the
+ protocol interface is the same.
+
+ I made other cosmetic changes to variable names and such.
+
+ * Misc.subproj/WebIconLoader.h:
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading])
+ * WebView.subproj/WebMainResourceClient.h:
+
2002-09-25 Maciej Stachowiak <mjs at apple.com>
- fixed 2854536 - New cookie policy: "accept cookies only from the
diff --git a/WebKit/Misc.subproj/WebIconLoader.h b/WebKit/Misc.subproj/WebIconLoader.h
index 5b325ff..8efe799 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 WebResourceClient;
+ at protocol WebResourceHandleDelegate;
/*!
@class WebIconLoader
*/
- at interface WebIconLoader : NSObject <WebResourceClient>
+ at interface WebIconLoader : NSObject <WebResourceHandleDelegate>
{
WebIconLoaderPrivate *_private;
}
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 681f3c0..b3fddbe 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -84,7 +84,7 @@
}
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:_private->URL];
- _private->handle = [[WebResourceHandle alloc] initWithRequest:request client:self];
+ _private->handle = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
[request release];
if (_private->handle) {
[_private->handle loadInBackground];
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 1afcbf7..a54b464 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -27,7 +27,7 @@
- (void)cancel;
@end
- at interface WebNetscapePluginStream (WebResourceClient) <WebResourceClient>
+ at interface WebNetscapePluginStream (WebResourceHandleDelegate) <WebResourceHandleDelegate>
@end
@implementation WebNetscapePluginStream
@@ -100,7 +100,7 @@
- (void)startLoad
{
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
- resource = [[WebResourceHandle alloc] initWithRequest:request client:self];
+ resource = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
[resource loadInBackground];
[request release];
[[view webController] _didStartLoading:[resource URL]];
@@ -273,7 +273,7 @@
#pragma mark WebResourceHandle
- at implementation WebNetscapePluginStream (WebResourceClient)
+ at implementation WebNetscapePluginStream (WebResourceHandleDelegate)
- (NSString *)handleWillUseUserAgent:(WebResourceHandle *)handle forURL:(NSURL *)theURL
{
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 698e7f4..31bdd23 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -167,7 +167,7 @@
ASSERT(frame != nil);
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
- WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request client:nil];
+ WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request delegate:nil];
WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
[[frame controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource:[self dataSource] complete:YES];
[loadProgress release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
index f36748b..bdc7bb2 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
@@ -6,13 +6,13 @@
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebFoundation/WebResourceClient.h>
+#import <WebFoundation/WebResourceHandleDelegate.h>
@class WebDataSource;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
- at interface WebSubresourceClient : NSObject <WebResourceClient, WebCoreResourceHandle>
+ at interface WebSubresourceClient : NSObject <WebResourceHandleDelegate, WebCoreResourceHandle>
{
id <WebCoreResourceLoader> loader;
WebDataSource *dataSource;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index b04a38e..8918ecf 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -75,7 +75,7 @@
[request setResponseCachePolicy:[[source request] responseCachePolicy]];
[request setReferrer:referrer];
[request setCookiePolicyBaseURL:[[[[source controller] mainFrame] dataSource] URL]];
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request client:client];
+ WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
[request release];
if (h == nil) {
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
index f36748b..bdc7bb2 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
@@ -6,13 +6,13 @@
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebFoundation/WebResourceClient.h>
+#import <WebFoundation/WebResourceHandleDelegate.h>
@class WebDataSource;
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
- at interface WebSubresourceClient : NSObject <WebResourceClient, WebCoreResourceHandle>
+ at interface WebSubresourceClient : NSObject <WebResourceHandleDelegate, WebCoreResourceHandle>
{
id <WebCoreResourceLoader> loader;
WebDataSource *dataSource;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index b04a38e..8918ecf 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -75,7 +75,7 @@
[request setResponseCachePolicy:[[source request] responseCachePolicy]];
[request setReferrer:referrer];
[request setCookiePolicyBaseURL:[[[[source controller] mainFrame] dataSource] URL]];
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request client:client];
+ WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
[request release];
if (h == nil) {
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 4ff4489..b648d13 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -194,7 +194,7 @@
[_private->request setCookiePolicyBaseURL:[[[_private->controller mainFrame] dataSource] URL]];
}
- _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request client:_private->mainClient];
+ _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request delegate:_private->mainClient];
}
[_private->mainClient didStartLoadingWithURL:[_private->mainHandle URL]];
[_private->mainHandle loadInBackground];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index f8f224f..26023d9 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -13,10 +13,10 @@
@class WebDownloadHandler;
@class WebDataSource;
@class WebResourceHandle;
- at protocol WebResourceClient;
+ at protocol WebResourceHandleDelegate;
@protocol WebResourceProgressDelegate;
- at interface WebMainResourceClient : NSObject <WebResourceClient>
+ at interface WebMainResourceClient : NSObject <WebResourceHandleDelegate>
{
NSURL *currentURL;
WebDataSource *dataSource;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index f8f224f..26023d9 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -13,10 +13,10 @@
@class WebDownloadHandler;
@class WebDataSource;
@class WebResourceHandle;
- at protocol WebResourceClient;
+ at protocol WebResourceHandleDelegate;
@protocol WebResourceProgressDelegate;
- at interface WebMainResourceClient : NSObject <WebResourceClient>
+ at interface WebMainResourceClient : NSObject <WebResourceHandleDelegate>
{
NSURL *currentURL;
WebDataSource *dataSource;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list