[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:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 918cd8f66acb6381605ce714e7d37db04645c999
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 25 18:23:09 2002 +0000
WebFoundation:
Changes to move the WebResourceHandle API closer to the
specified design. This includes:
- Removed loadInBackground method from the public interface.
- Start asynchronous loading in WebResourceHandle init method.
- Remove loadInForeground: from WebResourceHandle interface.
- Add nice comments to WebResourceHandle header file.
- Move WebResourceHandle callback deferral methods to SPI header file.
- Some cleanups in synchronous loading.
- Change name of WebResourceHandle cancelLoadInBackground method to cancel.
- Some changes to the C glue (why do I even pretend that I am keeping
this glue code working?)
* CacheLoader.subproj/IFURLHandleC.h:
* CacheLoader.subproj/IFURLHandleC.m:
(IFURLHandleCancelLoadInBackground)
(IFURLHandleDidRedirectToURL)
* CacheLoader.subproj/WebResourceHandle.h:
* CacheLoader.subproj/WebResourceHandle.m:
(+[WebResourceHandle canInitWithRequest:])
(-[WebResourceHandle initWithRequest:delegate:])
(-[WebResourceHandle cancel])
(-[WebResourceHandle loadInForeground:])
(-[WebResourceHandle loadInForeground])
* CacheLoader.subproj/WebResourceHandleInternal.h:
* CacheLoader.subproj/WebResourceHandleInternal.m:
(-[WebResourceHandle _loadInBackground])
(-[WebResourceHandle _postCallback:])
(-[WebResourceHandle _sendCallbacks])
* CacheLoader.subproj/WebResourceHandlePrivate.h:
* CacheLoader.subproj/WebResourceHandlePrivate.m:
(-[WebResourceHandle _setDefersCallbacks:])
(-[WebResourceHandle _defersCallbacks])
* CacheLoader.subproj/WebResourceLoad.m:
(-[WebResourceLoad cancel])
* CacheLoader.subproj/WebResourceSynchronousClient.m:
(-[WebResourceHandleSynchronousDelegate run:])
(-[WebResourceHandleSynchronousDelegate finished])
* WebFoundation.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Changes to move the WebResourceHandle API closer to the
specified design. This includes:
- Removed loadInBackground method from the public interface.
- Start asynchronous loading in WebResourceHandle init method. This required some
code reorganization in callers.
- Remove loadInForeground: from WebResourceHandle interface.
- Move WebResourceHandle callback deferral methods to SPI header file.
- Change name of WebResourceHandle cancelLoadInBackground method to cancel.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading])
(-[WebIconLoader stopLoading])
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream startLoad])
(-[WebNetscapePluginStream cancel])
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
(-[WebSubresourceClient cancel])
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading])
(-[WebDataSource _addSubresourceClient:])
(-[WebDataSource _stopLoading])
(-[WebDataSource _defersCallbacksChanged])
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient handle:didReceiveData:])
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9bd4edd..c5e9108 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,32 @@
+2002-09-25 Ken Kocienda <kocienda at apple.com>
+
+ Changes to move the WebResourceHandle API closer to the
+ specified design. This includes:
+
+ - Removed loadInBackground method from the public interface.
+ - Start asynchronous loading in WebResourceHandle init method. This required some
+ code reorganization in callers.
+ - Remove loadInForeground: from WebResourceHandle interface.
+ - Move WebResourceHandle callback deferral methods to SPI header file.
+ - Change name of WebResourceHandle cancelLoadInBackground method to cancel.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ (-[WebIconLoader stopLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ (-[WebNetscapePluginStream cancel])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
+ (-[WebSubresourceClient cancel])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading])
+ (-[WebDataSource _addSubresourceClient:])
+ (-[WebDataSource _stopLoading])
+ (-[WebDataSource _defersCallbacksChanged])
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:didReceiveData:])
+
2002-09-25 Chris Blumenberg <cblu at apple.com>
Fixed: 3050665 - REGRESSION: mp3 audio loads and plays, but no progress or play control is visible
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9bd4edd..c5e9108 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,32 @@
+2002-09-25 Ken Kocienda <kocienda at apple.com>
+
+ Changes to move the WebResourceHandle API closer to the
+ specified design. This includes:
+
+ - Removed loadInBackground method from the public interface.
+ - Start asynchronous loading in WebResourceHandle init method. This required some
+ code reorganization in callers.
+ - Remove loadInForeground: from WebResourceHandle interface.
+ - Move WebResourceHandle callback deferral methods to SPI header file.
+ - Change name of WebResourceHandle cancelLoadInBackground method to cancel.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ (-[WebIconLoader stopLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ (-[WebNetscapePluginStream cancel])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:])
+ (-[WebSubresourceClient cancel])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading])
+ (-[WebDataSource _addSubresourceClient:])
+ (-[WebDataSource _stopLoading])
+ (-[WebDataSource _defersCallbacksChanged])
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:didReceiveData:])
+
2002-09-25 Chris Blumenberg <cblu at apple.com>
Fixed: 3050665 - REGRESSION: mp3 audio loads and plays, but no progress or play control is visible
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index f84e2e8..b7c76fa 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -86,14 +86,11 @@
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:_private->URL];
_private->handle = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
[request release];
- if (_private->handle) {
- [_private->handle loadInBackground];
- }
}
- (void)stopLoading
{
- [_private->handle cancelLoadInBackground];
+ [_private->handle cancel];
[_private->handle release];
_private->handle = nil;
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index a1d46b6..fda30b4 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -101,7 +101,6 @@
{
WebResourceRequest *request = [[WebResourceRequest alloc] initWithURL:URL];
resource = [[WebResourceHandle alloc] initWithRequest:request delegate:self];
- [resource loadInBackground];
[request release];
[[view webController] _didStartLoading:[resource URL]];
}
@@ -315,7 +314,7 @@
return;
}
- [resource cancelLoadInBackground];
+ [resource cancel];
WebController *webController = [view webController];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index bce20cd..c188c46 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -75,10 +75,9 @@
[request setResponseCachePolicy:[[source request] responseCachePolicy]];
[request setReferrer:referrer];
[request setCookiePolicyBaseURL:[[[[source controller] mainFrame] dataSource] URL]];
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
- [request release];
- if (h == nil) {
+ if (![WebResourceHandle canInitWithRequest:request]) {
+ [request release];
[rLoader cancel];
WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
@@ -90,11 +89,12 @@
return nil;
}
+ WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
client->handle = h;
[source _addSubresourceClient:client];
- [client didStartLoadingWithURL:[h URL]];
+ [client didStartLoadingWithURL:[request canonicalURL]];
[client receivedProgressWithComplete:NO];
- [h loadInBackground];
+ [request release];
return [client autorelease];
}
@@ -195,7 +195,7 @@
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
- [handle cancelLoadInBackground];
+ [handle cancel];
[loader cancel];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index bce20cd..c188c46 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -75,10 +75,9 @@
[request setResponseCachePolicy:[[source request] responseCachePolicy]];
[request setReferrer:referrer];
[request setCookiePolicyBaseURL:[[[[source controller] mainFrame] dataSource] URL]];
- WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
- [request release];
- if (h == nil) {
+ if (![WebResourceHandle canInitWithRequest:request]) {
+ [request release];
[rLoader cancel];
WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
@@ -90,11 +89,12 @@
return nil;
}
+ WebResourceHandle *h = [[WebResourceHandle alloc] initWithRequest:request delegate:client];
client->handle = h;
[source _addSubresourceClient:client];
- [client didStartLoadingWithURL:[h URL]];
+ [client didStartLoadingWithURL:[request canonicalURL]];
[client receivedProgressWithComplete:NO];
- [h loadInBackground];
+ [request release];
return [client autorelease];
}
@@ -195,7 +195,7 @@
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
- [handle cancelLoadInBackground];
+ [handle cancel];
[loader cancel];
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index b648d13..4b4f6b4 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -35,6 +35,7 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceHandlePrivate.h>
#import <WebFoundation/WebResourceRequest.h>
#import <WebCore/WebCoreEncodings.h>
@@ -197,7 +198,6 @@
_private->mainHandle = [[WebResourceHandle alloc] initWithRequest:_private->request delegate:_private->mainClient];
}
[_private->mainClient didStartLoadingWithURL:[_private->mainHandle URL]];
- [_private->mainHandle loadInBackground];
}
- (void)_addSubresourceClient:(WebSubresourceClient *)client
@@ -206,7 +206,7 @@
_private->subresourceClients = [[NSMutableArray alloc] init];
}
if ([_private->controller _defersCallbacks]) {
- [[client handle] setDefersCallbacks:YES];
+ [[client handle] _setDefersCallbacks:YES];
}
[_private->subresourceClients addObject:client];
[self _setLoading:YES];
@@ -231,7 +231,7 @@
_private->stopping = YES;
- [_private->mainHandle cancelLoadInBackground];
+ [_private->mainHandle cancel];
[_private->mainClient didCancelWithHandle:_private->mainHandle];
NSArray *clients = [_private->subresourceClients copy];
@@ -516,11 +516,11 @@
}
_private->defersCallbacks = defers;
- [_private->mainHandle setDefersCallbacks:defers];
+ [_private->mainHandle _setDefersCallbacks:defers];
NSEnumerator *e = [_private->subresourceClients objectEnumerator];
WebSubresourceClient *client;
while ((client = [e nextObject])) {
- [[client handle] setDefersCallbacks:defers];
+ [[client handle] _setDefersCallbacks:defers];
}
[[self children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 68dba85..7fb4b25 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -247,7 +247,7 @@
downloadError = [downloadHandler receivedData:data];
break;
case WebContentPolicyIgnore:
- [handle cancelLoadInBackground];
+ [handle cancel];
[self didCancelWithHandle:handle];
[frame _setProvisionalDataSource:nil];
[[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
@@ -262,9 +262,9 @@
[self receivedError:downloadError forHandle:handle];
// Supress errors because we don't want to confuse the client with
- // the cancel error that will follow after cancelLoadInBackground.
+ // the cancel error that will follow after cancel.
suppressErrors = YES;
- [handle cancelLoadInBackground];
+ [handle cancel];
}
LOG(Download, "%d of %d", [[handle response] contentLengthReceived], [[handle response] contentLength]);
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 68dba85..7fb4b25 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -247,7 +247,7 @@
downloadError = [downloadHandler receivedData:data];
break;
case WebContentPolicyIgnore:
- [handle cancelLoadInBackground];
+ [handle cancel];
[self didCancelWithHandle:handle];
[frame _setProvisionalDataSource:nil];
[[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
@@ -262,9 +262,9 @@
[self receivedError:downloadError forHandle:handle];
// Supress errors because we don't want to confuse the client with
- // the cancel error that will follow after cancelLoadInBackground.
+ // the cancel error that will follow after cancel.
suppressErrors = YES;
- [handle cancelLoadInBackground];
+ [handle cancel];
}
LOG(Download, "%d of %d", [[handle response] contentLengthReceived], [[handle response] contentLength]);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list