[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:37:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1e8415e68a8d195dc690d646f7d12b919058a4df
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 10 21:29:26 2002 +0000
WebFoundation:
Changed API for setting the WebResourceClient for a request/load.
This has been removed from WebResourceRequest, and has been moved to
WebResourceHandle. The result is that the init method for a WebResourceHandle
now takes a WebResourceRequest and a WebResourceClient.
All of the changes below are simple code modifications to use the new API.
* CacheLoader.subproj/WebResourceHandle.h:
* CacheLoader.subproj/WebResourceHandle.m:
(-[WebResourceHandle loadInForeground:])
(-[WebResourceHandle client])
(-[WebResourceHandle initWithRequest:client:])
* 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/WebResourceRequest.h:
* CacheLoader.subproj/WebResourceRequest.m:
(-[WebResourceRequest initWithURL:])
(-[WebResourceRequest initWithURL:attributes:flags:])
(-[WebResourceRequest initWithURL:userAgent:attributes:flags:])
(-[WebResourceRequest copyWithZone:])
(-[WebResourceRequest dealloc])
* CacheLoader.subproj/WebResourceResponse.h:
WebKit:
Changed API for setting the WebResourceClient for a request/load.
This has been removed from WebResourceRequest, and has been moved to
WebResourceHandle. The result is that the init method for a WebResourceHandle
now takes a WebResourceRequest and a WebResourceClient.
All of the changes below are simple code modifications to use the new API.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading])
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream startLoad])
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge objectLoadedFromCache:size:])
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:dataSource:])
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading:])
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2021 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e21a28c..b06c0fd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2002-09-10 Ken Kocienda <kocienda at apple.com>
+
+ Changed API for setting the WebResourceClient for a request/load.
+
+ This has been removed from WebResourceRequest, and has been moved to
+ WebResourceHandle. The result is that the init method for a WebResourceHandle
+ now takes a WebResourceRequest and a WebResourceClient.
+
+ All of the changes below are simple code modifications to use the new API.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:dataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading:])
+
2002-09-10 Chris Blumenberg <cblu at apple.com>
* History.subproj/WebHistory.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e21a28c..b06c0fd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,24 @@
+2002-09-10 Ken Kocienda <kocienda at apple.com>
+
+ Changed API for setting the WebResourceClient for a request/load.
+
+ This has been removed from WebResourceRequest, and has been moved to
+ WebResourceHandle. The result is that the init method for a WebResourceHandle
+ now takes a WebResourceRequest and a WebResourceClient.
+
+ All of the changes below are simple code modifications to use the new API.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:dataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading:])
+
2002-09-10 Chris Blumenberg <cblu at apple.com>
* History.subproj/WebHistory.h:
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 09c2bdc..85d162b 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -89,8 +89,8 @@
return;
}
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:self URL:_private->URL];
- _private->handle = [[WebResourceHandle alloc] initWithRequest:request];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:_private->URL];
+ _private->handle = [[WebResourceHandle alloc] initWithRequest:request client:self];
[request release];
if (_private->handle) {
[_private->handle loadInBackground];
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 0a5062b..9370064 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -100,8 +100,8 @@
- (void)startLoad
{
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:self URL:URL attributes:attributes flags:0];
- resource = [[WebResourceHandle alloc] initWithRequest:request];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL attributes:attributes flags:0];
+ resource = [[WebResourceHandle alloc] initWithRequest:request client:self];
[resource loadInBackground];
[request release];
[[view webController] _didStartLoading:[resource URL]];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 84954c1..8801b50 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -188,8 +188,8 @@
{
ASSERT(frame != nil);
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:nil URL:URL];
- WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request client: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.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index fbde186..ec69168 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -69,8 +69,8 @@
withURL:(NSURL *)URL dataSource:(WebDataSource *)source
{
WebSubresourceClient *client = [[self alloc] initWithLoader:rLoader dataSource:source];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:client URL:URL attributes:nil flags:[source flags]];
- WebResourceHandle *h = [[[WebResourceHandle alloc] initWithRequest:request] autorelease];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL attributes:nil flags:[source flags]];
+ WebResourceHandle *h = [[[WebResourceHandle alloc] initWithRequest:request client:client] autorelease];
[request release];
if (h == nil) {
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index fbde186..ec69168 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -69,8 +69,8 @@
withURL:(NSURL *)URL dataSource:(WebDataSource *)source
{
WebSubresourceClient *client = [[self alloc] initWithLoader:rLoader dataSource:source];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:client URL:URL attributes:nil flags:[source flags]];
- WebResourceHandle *h = [[[WebResourceHandle alloc] initWithRequest:request] autorelease];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL attributes:nil flags:[source flags]];
+ WebResourceHandle *h = [[[WebResourceHandle alloc] initWithRequest:request client:client] autorelease];
[request release];
if (h == nil) {
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 61acbdd..e4c6c6b 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -181,8 +181,8 @@
// Fire this guy up.
if (!_private->mainHandle) {
_private->mainClient = [[WebMainResourceClient alloc] initWithDataSource: self];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:_private->mainClient URL:_private->inputURL attributes:_private->attributes flags:_private->flags];
- _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:request];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:_private->inputURL attributes:_private->attributes flags:_private->flags];
+ _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:request client:_private->mainClient];
[request release];
}
[_private->mainClient didStartLoadingWithURL:[_private->mainHandle URL]];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list