[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:31:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e7b38ec7d1e661bf397a497f47365c05321ef868
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 25 18:36:49 2003 +0000
WebFoundation:
Reviewed by Darin
Spilt NSURLRequest into the immutable and mutable variants
as specified by the approved API.
Updated other code to use NSMutableURLRequest where appropriate.
Also updated some comments in NSURLRequest.h and removed
obsolete WebRequestCachePolicyRevalidate NSURLRequestCachePolicy
constant.
* CacheLoader.subproj/NSURLRequest.h:
* CacheLoader.subproj/NSURLRequest.m:
(+[NSURLRequest requestWithURL:cachePolicy:timeoutInterval:]):
(+[NSURLRequest requestWithURL:]):
(-[NSURLRequest copyWithZone:]):
(-[NSURLRequest mutableCopyWithZone:]):
(-[NSURLRequest setURL:]):
(-[NSMutableURLRequest setURL:]):
(-[NSMutableURLRequest setCachePolicy:]):
(-[NSMutableURLRequest setTimeoutInterval:]):
(-[NSMutableURLRequest copyWithZone:]):
(-[NSMutableURLRequest mutableCopyWithZone:]):
* CacheLoader.subproj/WebResource.m:
(-[WebResource loadWithDelegate:]):
(-[WebResource _redirectedToRequest:permanent:]):
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol stateForCacheObject:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(-[WebSimpleHTTPProtocol _addRequestMessageBody]):
* WebFoundation.exp:
WebKit:
Reviewed by Darin
Updated to use NSMutableURLRequest where appropriate.
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView requestWithURLCString:]):
(-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource initWithRequest:]):
(-[WebDataSource request]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _setURL:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame loadRequest:]):
(-[WebFrame reload]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _loadItem:fromItem:withLoadType:]):
(-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
(-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
(-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
WebBrowser:
Reviewed by Darin
Updated to use NSMutableURLRequest where appropriate.
* BrowserDocumentController.m:
(-[BrowserDocumentController _goToEachRequest:windowPolicy:frameName:]):
* BugReportController.m:
(-[BugReportController sendBugReportToAppleWithScreenShot:source:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3915 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 176005b..a50f18f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,30 @@
+2003-03-25 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Darin
+
+ Updated to use NSMutableURLRequest where appropriate.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView requestWithURLCString:]):
+ (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithRequest:]):
+ (-[WebDataSource request]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setURL:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame loadRequest:]):
+ (-[WebFrame reload]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _loadItem:fromItem:withLoadType:]):
+ (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+ (-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ (-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
+
2003-03-25 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index a8fee4b..a25a737 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1007,7 +1007,7 @@ typedef struct {
@implementation WebBaseNetscapePluginView (WebNPPCallbacks)
-- (NSURLRequest *)requestWithURLCString:(const char *)URLCString
+- (NSMutableURLRequest *)requestWithURLCString:(const char *)URLCString
{
if (!URLCString) {
return nil;
@@ -1021,7 +1021,7 @@ typedef struct {
return nil;
}
- return [NSURLRequest requestWithURL:URL];
+ return [NSMutableURLRequest requestWithURL:URL];
}
- (void)loadPluginRequest:(WebPluginRequest *)pluginRequest
@@ -1163,7 +1163,7 @@ typedef struct {
return NPERR_INVALID_PARAM;
}
- NSURLRequest *request = [self requestWithURLCString:URLCString];
+ NSMutableURLRequest *request = [self requestWithURLCString:URLCString];
[request HTTPSetMethod:@"POST"];
if (allowHeaders) {
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 9a7b391..848c8b0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -46,7 +46,7 @@
[source _addSubresourceClient:client];
- NSURLRequest *newRequest = [[NSURLRequest alloc] initWithURL:URL];
+ NSMutableURLRequest *newRequest = [[NSMutableURLRequest alloc] initWithURL:URL];
[newRequest setCachePolicy:[[source request] cachePolicy]];
[newRequest HTTPSetReferrer:referrer];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 9a7b391..848c8b0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -46,7 +46,7 @@
[source _addSubresourceClient:client];
- NSURLRequest *newRequest = [[NSURLRequest alloc] initWithURL:URL];
+ NSMutableURLRequest *newRequest = [[NSMutableURLRequest alloc] initWithURL:URL];
[newRequest setCachePolicy:[[source request] cachePolicy]];
[newRequest HTTPSetReferrer:referrer];
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 50867c8..92115cb 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -12,6 +12,7 @@
@class WebFrame;
@class WebResource;
@class NSURLRequest;
+ at class NSMutableURLRequest;
@class WebResponse;
@protocol WebDocumentRepresentation;
@@ -73,7 +74,7 @@
@method request
@result Returns the request that was used to create this datasource.
*/
--(NSURLRequest *)request;
+-(NSMutableURLRequest *)request;
/*!
@method response
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 8112a1b..8aee51c 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -33,7 +33,7 @@
_private = [[WebDataSourcePrivate alloc] init];
_private->originalRequest = [request retain];
_private->originalRequestCopy = [request copy];
- _private->request = [_private->originalRequest retain];
+ _private->request = [_private->originalRequest mutableCopy];
++WebDataSourceCount;
@@ -69,7 +69,7 @@
return _private->originalRequest;
}
--(NSURLRequest *)request
+-(NSMutableURLRequest *)request
{
return _private->request;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 2807d67..2bdcda0 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -41,7 +41,7 @@
// The 'working' request for this datasource. It may be mutated
// several times from the original request to include additional
// headers, cookie information, canonicalization and redirects.
- NSURLRequest *request;
+ NSMutableURLRequest *request;
WebResponse *response;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index edd3727..4b9c366 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -311,7 +311,7 @@
- (void)_setURL:(NSURL *)URL
{
- NSURLRequest *newRequest = [_private->request copy];
+ NSMutableURLRequest *newRequest = [_private->request mutableCopy];
[_private->request release];
[newRequest setURL:URL];
_private->request = newRequest;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index c03945b..a0a16d2 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -100,7 +100,7 @@
// note this copies request
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
- NSURLRequest *r = [newDataSource request];
+ NSMutableURLRequest *r = [newDataSource request];
[self _addExtraFieldsToRequest:r alwaysFromRequest: NO];
if ([self _shouldTreatURLAsSameAsCurrent:[request URL]]) {
[r setCachePolicy:NSURLRequestReloadIgnoringCacheData];
@@ -137,7 +137,7 @@
// initWithRequest copies the request
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:[dataSource request]];
- NSURLRequest *request = [newDataSource request];
+ NSMutableURLRequest *request = [newDataSource request];
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
// If we're about to rePOST, set up action so the app can warn the user
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 37b493b..0e63d39 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1085,7 +1085,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _loadDataSource:newDataSource withLoadType:loadType formState:nil];
}
else {
- NSURLRequest *request = [[NSURLRequest alloc] initWithURL:itemURL];
+ NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:itemURL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (formData != nil)?YES:NO];
// If this was a repost that failed the page cache, we might try to repost the form.
@@ -1524,7 +1524,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
{
BOOL isFormSubmission = (values != nil);
- NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
+ NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
[request HTTPSetReferrer:referrer];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (event != nil || isFormSubmission)];
if (loadType == WebFrameLoadTypeReload) {
@@ -1651,7 +1651,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// When posting, use the WebResourceHandleFlagLoadFromOrigin 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.
- NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
+ NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: YES];
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
[request HTTPSetMethod:@"POST"];
@@ -1750,7 +1750,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return;
}
- NSURLRequest *request = [[dataSource request] copy];
+ NSMutableURLRequest *request = [[dataSource request] mutableCopy];
[request setCachePolicy:NSURLRequestReturnCacheDataElseLoad];
WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
[request release];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list