[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:38:34 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9ea1c56937962f6ec39d76bfb4b778a6e57e90e4
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 12 21:51:09 2002 +0000
WebFoundation:
Removed load flags as a design concept. Replaced with new "caching policy" concept
which are set on a WebResourceRequest. These policies determine how a load will
be processed with regards to the cache.
* CacheLoader.subproj/IFURLHandleC.h: Removed obsolete IFURLHandleGetFlags function
* CacheLoader.subproj/IFURLHandleC.m: Ditto.
* CacheLoader.subproj/WebCFNetworkHTTPProtocolHandler.m:
(-[WebCFNetworkHTTPProtocolHandler continueHeaderReadAfter3xxResponseAndCall:]): Temporary hack until new redirect API is available.
* CacheLoader.subproj/WebCacheLoaderConstants.h: Removed all load flags.
* CacheLoader.subproj/WebHTTPProtocolHandler.m:
(-[WebHTTPProtocolHandler determineErrorAndFail]): Removed calls to load flags and replaced with calls to new request policies.
(-[WebHTTPProtocolHandler testAndSetCacheObjectState:]): Ditto.
* CacheLoader.subproj/WebResourceHandle.m: Removed flags accessor, and removed calls to load flags and replaced with calls to new request policies.
(-[WebResourceHandle description]): Removed calls to load flags and replaced with calls to new request policies.
* CacheLoader.subproj/WebResourceLoad.m:
(-[WebResourceLoad _beginLoad]): Ditto.
(-[WebResourceLoad description]): Ditto.
* CacheLoader.subproj/WebResourceLoadManager.m:
(+[WebResourceLoadKey keyWithHandle:]): Ditto.
(+[WebResourceLoadKey keyWithLoad:]): Ditto.
(-[WebResourceLoadKey isEqual:]): Ditto.
(-[WebResourceLoadKey hash]): Ditto.
(-[WebResourceLoadManager requestWithURLHandle:]): Ditto.
(-[WebResourceLoadManager loadDidFinish:]): Ditto.
* CacheLoader.subproj/WebResourceRequest.h: Added new WebRequestCachePolicy and WebResponseCachePolicy enums, and accessor methods to set these values on a request.
* CacheLoader.subproj/WebResourceRequest.m:
(-[WebResourceRequest initWithURL:]): Ditto.
(-[WebResourceRequest requestCachePolicy]): Added.
(-[WebResourceRequest setRequestCachePolicy:]): Added.
(-[WebResourceRequest responseCachePolicy]): Added.
(-[WebResourceRequest setResponseCachePolicy:]): Added
(-[WebResourceRequest copyWithZone:]): Removed calls to load flags and replaced with calls to new request policies.
* CacheLoader.subproj/WebSimpleHTTPProtocolHandler.m:
(WebSimpleHTTPProtocolHandlerInit): Added some initial support for the notion of "specially-handled" headers. This work is not done yet.
(-[WebSimpleHTTPProtocolHandler createHTTPRequest]): Fixed case where we appended nil if there was no user-agent set.
(-[WebSimpleHTTPProtocolHandler _examineHeaders]): Removed calls to load flags and replaced with calls to new request policies.
* Misc.subproj/WebFoundation.h:
* WebFoundation.exp: Removed obsolete _IFURLHandleGetFlags symbol.
WebKit:
Removed load flags as a design concept. Replaced with new "caching policy" concept
which are set on a WebResourceRequest. These policies determine how a load will
be processed with regards to the cache.
* WebCoreSupport.subproj/WebBridge.h: Removed flags from loadURL method.
* WebCoreSupport.subproj/WebBridge.m: Removed calls to load flags and replaced with calls to new request policies.
(-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
(-[WebBridge isReloading]): Ditto.
(-[WebBridge loadURL:referrer:]): Ditto.
(-[WebBridge loadURL:withParent:]): Removed flags from loadURL method.
(-[WebBridge postWithURL:referrer:data:]): Removed calls to load flags and replaced with calls to new request policies.
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]): Ditto.
* WebView.subproj/WebDataSource.h: Removed flags from init method.
* WebView.subproj/WebDataSource.m:
(-[WebDataSource initWithURL:]): Ditto.
(-[WebDataSource initWithRequest:]): Ditto.
* WebView.subproj/WebDataSourcePrivate.h: Removed flags ivar, and dangling attributes ivar.
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSourcePrivate dealloc]): Ditto.
* WebView.subproj/WebFrame.m:
(-[WebFrame reload:]): Removed calls to load flags and replaced with calls to new request policies.
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _goToItem:withFrameLoadType:]): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 81c953e..f9b0019 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,30 @@
+2002-09-12 Ken Kocienda <kocienda at apple.com>
+
+ Removed load flags as a design concept. Replaced with new "caching policy" concept
+ which are set on a WebResourceRequest. These policies determine how a load will
+ be processed with regards to the cache.
+
+ * WebCoreSupport.subproj/WebBridge.h: Removed flags from loadURL method.
+ * WebCoreSupport.subproj/WebBridge.m: Removed calls to load flags and replaced with calls to new request policies.
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
+ (-[WebBridge isReloading]): Ditto.
+ (-[WebBridge loadURL:referrer:]): Ditto.
+ (-[WebBridge loadURL:withParent:]): Removed flags from loadURL method.
+ (-[WebBridge postWithURL:referrer:data:]): Removed calls to load flags and replaced with calls to new request policies.
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]): Ditto.
+ * WebView.subproj/WebDataSource.h: Removed flags from init method.
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithURL:]): Ditto.
+ (-[WebDataSource initWithRequest:]): Ditto.
+ * WebView.subproj/WebDataSourcePrivate.h: Removed flags ivar, and dangling attributes ivar.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]): Ditto.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame reload:]): Removed calls to load flags and replaced with calls to new request policies.
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _goToItem:withFrameLoadType:]): Ditto.
+
2002-09-12 Chris Blumenberg <cblu at apple.com>
Make WebTextView private and exported.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 81c953e..f9b0019 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,30 @@
+2002-09-12 Ken Kocienda <kocienda at apple.com>
+
+ Removed load flags as a design concept. Replaced with new "caching policy" concept
+ which are set on a WebResourceRequest. These policies determine how a load will
+ be processed with regards to the cache.
+
+ * WebCoreSupport.subproj/WebBridge.h: Removed flags from loadURL method.
+ * WebCoreSupport.subproj/WebBridge.m: Removed calls to load flags and replaced with calls to new request policies.
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]):
+ (-[WebBridge isReloading]): Ditto.
+ (-[WebBridge loadURL:referrer:]): Ditto.
+ (-[WebBridge loadURL:withParent:]): Removed flags from loadURL method.
+ (-[WebBridge postWithURL:referrer:data:]): Removed calls to load flags and replaced with calls to new request policies.
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]): Ditto.
+ * WebView.subproj/WebDataSource.h: Removed flags from init method.
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource initWithURL:]): Ditto.
+ (-[WebDataSource initWithRequest:]): Ditto.
+ * WebView.subproj/WebDataSourcePrivate.h: Removed flags ivar, and dangling attributes ivar.
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSourcePrivate dealloc]): Ditto.
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame reload:]): Removed calls to load flags and replaced with calls to new request policies.
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _goToItem:withFrameLoadType:]): Ditto.
+
2002-09-12 Chris Blumenberg <cblu at apple.com>
Make WebTextView private and exported.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.h b/WebKit/WebCoreSupport.subproj/WebBridge.h
index d546365..7a69c70 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.h
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.h
@@ -21,7 +21,7 @@
- (void)dataSourceChanged;
- (WebDataSource *)dataSource;
-- (void)loadURL:(NSURL *)URL flags:(unsigned)flags withParent:(WebDataSource *)parent;
+- (void)loadURL:(NSURL *)URL withParent:(WebDataSource *)parent;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index eaadac7..f18d906 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -78,7 +78,7 @@
[[newFrame webView] _setMarginWidth:width];
[[newFrame webView] _setMarginHeight:height];
- [[newFrame _bridge] loadURL:URL flags:0 withParent:[self dataSource]];
+ [[newFrame _bridge] loadURL:URL withParent:[self dataSource]];
// Set the load type so this load doesn't end up in the back
// forward list.
@@ -199,7 +199,7 @@
- (BOOL)isReloading
{
- return ([[[self dataSource] request] flags] & WebResourceHandleFlagLoadFromOrigin);
+ return ([[[self dataSource] request] requestCachePolicy] == WebRequestCachePolicyLoadFromOrigin);
}
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date
@@ -276,15 +276,15 @@
- (void)loadURL:(NSURL *)URL referrer:(NSString *)referrer
{
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL flags:0];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
[request setReferrer:referrer];
[self loadRequest:request withParent:[[frame dataSource] parent]];
[request release];
}
-- (void)loadURL:(NSURL *)URL flags:(unsigned)flags withParent:(WebDataSource *)parent
+- (void)loadURL:(NSURL *)URL withParent:(WebDataSource *)parent
{
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL flags:flags];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
[self loadRequest:request withParent:parent];
[request release];
}
@@ -295,7 +295,8 @@
// 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.
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL flags:WebResourceHandleFlagLoadFromOrigin];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
[request setMethod:@"POST"];
[request setData:data];
[request setReferrer:referrer];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 2da4e80..26ba9fe 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -69,7 +69,9 @@
withURL:(NSURL *)URL referrer:(NSString *)referrer forDataSource:(WebDataSource *)source
{
WebSubresourceClient *client = [[self alloc] initWithLoader:rLoader dataSource:source];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL flags:[[source request] flags]];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ [request setRequestCachePolicy:[[source request] requestCachePolicy]];
+ [request setResponseCachePolicy:[[source request] responseCachePolicy]];
[request setReferrer:referrer];
WebResourceHandle *h = [[[WebResourceHandle alloc] initWithRequest:request client:client] autorelease];
[request release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 2da4e80..26ba9fe 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -69,7 +69,9 @@
withURL:(NSURL *)URL referrer:(NSString *)referrer forDataSource:(WebDataSource *)source
{
WebSubresourceClient *client = [[self alloc] initWithLoader:rLoader dataSource:source];
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL flags:[[source request] flags]];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
+ [request setRequestCachePolicy:[[source request] requestCachePolicy]];
+ [request setResponseCachePolicy:[[source request] responseCachePolicy]];
[request setReferrer:referrer];
WebResourceHandle *h = [[[WebResourceHandle alloc] initWithRequest:request client:client] autorelease];
[request release];
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index e2eae05..05d4993 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -32,7 +32,6 @@
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-(id)initWithURL:(NSURL *)URL;
--(id)initWithURL:(NSURL *)URL flags:(unsigned)theFlags;
-(id)initWithRequest:(WebResourceRequest *)request;
#ifdef TENTATIVE_API
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index b9a5ff4..411cd62 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -25,14 +25,9 @@
-(id)initWithURL:(NSURL *)URL
{
- return [self initWithURL:URL flags:0];
-}
-
--(id)initWithURL:(NSURL *)URL flags:(unsigned)theFlags
-{
id result = nil;
- WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL flags:theFlags];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
if (request) {
result = [self initWithRequest:request];
[request release];
@@ -54,8 +49,6 @@
_private = [[WebDataSourcePrivate alloc] init];
_private->request = [request retain];
_private->inputURL = [[request canonicalURL] retain];
- _private->attributes = nil;
- _private->flags = [request flags];
++WebDataSourceCount;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 6dd3a65..4931235 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -29,8 +29,6 @@
// The original URL as requested during initialization.
NSURL *inputURL;
- NSDictionary *attributes;
- unsigned flags;
WebResourceRequest *request;
// The original URL we may have been redirected to.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 97c159b..9595384 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -63,7 +63,6 @@
[resourceData release];
[representation release];
[inputURL release];
- [attributes release];
[request release];
[finalURL release];
[frames release];
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index e9dbf87..f40e380 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -190,15 +190,16 @@
- (void)reload: (BOOL)forceRefresh
{
WebDataSource *dataSource = [self dataSource];
- unsigned flags;
+ WebResourceRequest *request;
if (dataSource == nil) {
return;
}
- flags = [[dataSource request] flags] | WebResourceHandleFlagLoadFromOrigin;
+ request = [[dataSource request] copy];
+ [request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
- WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:[dataSource URL] flags:flags];
+ WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
[newDataSource _setParent:[dataSource parent]];
if ([self setProvisionalDataSource:newDataSource]) {
[self _setLoadType:WebFrameLoadTypeRefresh];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 3dbcfc6..3a59669 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -647,6 +647,7 @@ static const char * const stateNames[] = {
- (void)_goToItem: (WebHistoryItem *)item withFrameLoadType: (WebFrameLoadType)type
{
NSURL *itemURL = [item URL];
+ WebResourceRequest *request;
WebDataSource *dataSource;
NSURL *originalURL = [[self dataSource] originalURL];
@@ -662,11 +663,12 @@ static const char * const stateNames[] = {
[[_private->dataSource _bridge] scrollToAnchor: [item anchor]];
}
else {
- unsigned flags = 0;
+ request = [[WebResourceRequest alloc] initWithURL:itemURL];
if (type == WebFrameLoadTypeBack || type == WebFrameLoadTypeForward) {
- flags = WebResourceHandleUseCachedObjectIfPresent;
+ [request setRequestCachePolicy:WebRequestCachePolicyReturnCacheObjectLoadFromOriginIfNoCacheObject];
}
- dataSource = [[WebDataSource alloc] initWithURL:itemURL flags:flags];
+ dataSource = [[WebDataSource alloc] initWithRequest:request];
+ [request release];
[self setProvisionalDataSource: dataSource];
[self _setLoadType: type];
[self startLoading];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list