[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:46:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 63d385e8dea67a43dee68e66f3706e7b36b34ad2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 2 20:53:57 2002 +0000
WebFoundation:
Add return value to willSendRequest callback.
* CacheLoader.subproj/WebResourceHandleDelegate.h: Add return value.
* CacheLoader.subproj/WebResourceHandle.m:
(-[WebResourceHandle loadWithDelegate:]): Call _notifyClientWillSendRequest to do the work
of sending the willSendRequest message in the canonical URL case, to avoid duplicate code.
* CacheLoader.subproj/WebResourceHandleInternal.m:
(-[WebResourceHandle _notifyClientWillSendRequest]): Keep the returned request.
* CacheLoader.subproj/WebResourceCallbackClient.m:
(-[WebResourceCallbackClient handle:willSendRequest:]):
* CacheLoader.subproj/WebResourceSynchronousDelegate.m:
(-[WebResourceHandleSynchronousDelegate handle:willSendRequest:]):
Update to return the request.
WebKit:
Add return value to willSendRequest callback.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader handle:willSendRequest:]):
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream handle:willSendRequest:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient handle:willSendRequest:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient handle:willSendRequest:]):
Update to return the request.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7788e5f..0b500ba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
2002-10-02 Darin Adler <darin at apple.com>
+ Add return value to willSendRequest callback.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader handle:willSendRequest:]):
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream handle:willSendRequest:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient handle:willSendRequest:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:willSendRequest:]):
+ Update to return the request.
+
+2002-10-02 Darin Adler <darin at apple.com>
+
Use the text encoding name from the response and got rid of
[WebDataSource encoding]. Also remove the "first chunk" logic since we
now get a separate callback for the response.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7788e5f..0b500ba 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
2002-10-02 Darin Adler <darin at apple.com>
+ Add return value to willSendRequest callback.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader handle:willSendRequest:]):
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream handle:willSendRequest:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient handle:willSendRequest:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:willSendRequest:]):
+ Update to return the request.
+
+2002-10-02 Darin Adler <darin at apple.com>
+
Use the text encoding name from the response and got rid of
[WebDataSource encoding]. Also remove the "first chunk" logic since we
now get a separate callback for the response.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index f3b9c95..05fcd05 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -105,9 +105,9 @@
}
}
--(void)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
+-(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
{
- // no-op
+ return request;
}
-(void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 4590064..109e0f2 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -282,13 +282,15 @@
@implementation WebNetscapePluginStream (WebResourceHandleDelegate)
--(void)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)theRequest
+-(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)theRequest
{
WebController *webController = [view controller];
[webController _didStopLoading:URL];
// FIXME: This next line is not sufficient. We don't do anything to remember the new URL.
[webController _didStartLoading:[theRequest URL]];
+
+ return theRequest;
}
- (void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 04d9df9..51c8e1b 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -109,7 +109,7 @@
partialProgress:[WebLoadProgress progressWithResourceHandle:handle] fromDataSource:dataSource];
}
--(void)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)request
+-(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)request
{
ASSERT(handle == h);
@@ -131,6 +131,8 @@
[self didStopLoading];
[self didStartLoadingWithURL:URL];
+
+ return request;
}
-(void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 04d9df9..51c8e1b 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -109,7 +109,7 @@
partialProgress:[WebLoadProgress progressWithResourceHandle:handle] fromDataSource:dataSource];
}
--(void)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)request
+-(WebResourceRequest *)handle:(WebResourceHandle *)h willSendRequest:(WebResourceRequest *)request
{
ASSERT(handle == h);
@@ -131,6 +131,8 @@
[self didStopLoading];
[self didStartLoadingWithURL:URL];
+
+ return request;
}
-(void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index fe9fe89..a83c166 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -193,7 +193,7 @@
[self release];
}
--(void)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
+-(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
{
WebController *controller = [dataSource controller];
NSURL *URL = [request URL];
@@ -208,6 +208,8 @@
[self didStopLoading];
[self didStartLoadingWithURL:URL];
+
+ return request;
}
-(void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)response
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index fe9fe89..a83c166 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -193,7 +193,7 @@
[self release];
}
--(void)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
+-(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)request
{
WebController *controller = [dataSource controller];
NSURL *URL = [request URL];
@@ -208,6 +208,8 @@
[self didStopLoading];
[self didStartLoadingWithURL:URL];
+
+ return request;
}
-(void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)response
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list