[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
vicki
vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:11:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ef4bed957aae5ddcd31af749fa093fc765734512
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 14 20:05:37 2003 +0000
- rolled out Darin's fixes for 3457162 and 3160035, since these changes broke plugins on macromedia.com and disney.go.com
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate setDataSource:]):
* WebView.subproj/WebDataSource.m:
(-[WebDataSource _addSubresourceClient:]):
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient dealloc]):
(-[WebMainResourceClient loadWithRequest:]):
(-[WebMainResourceClient setDefersCallbacks:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5498 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f1c6a8b..15d1309 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-11-14 Vicki Murley <vicki at apple.com>
+
+ - rolled out Darin's fixes for 3457162 and 3160035, since these changes broke plugins on macromedia.com and disney.go.com
+
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate setDataSource:]):
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource _addSubresourceClient:]):
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient dealloc]):
+ (-[WebMainResourceClient loadWithRequest:]):
+ (-[WebMainResourceClient setDefersCallbacks:]):
+
2003-11-14 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index b70005d..04ebe3a 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -155,8 +155,6 @@
[downloadDelegate release];
downloadDelegate = [[webView downloadDelegate] retain];
-
- [self setDefersCallbacks:[webView defersCallbacks]];
}
- (WebDataSource *)dataSource
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 05b60fe..e1abab3 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -211,6 +211,9 @@
if (_private->subresourceClients == nil) {
_private->subresourceClients = [[NSMutableArray alloc] init];
}
+ if ([_private->webView defersCallbacks]) {
+ [client setDefersCallbacks:YES];
+ }
[_private->subresourceClients addObject:client];
[self _setLoading:YES];
}
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index b70005d..04ebe3a 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -155,8 +155,6 @@
[downloadDelegate release];
downloadDelegate = [[webView downloadDelegate] retain];
-
- [self setDefersCallbacks:[webView defersCallbacks]];
}
- (WebDataSource *)dataSource
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index a62ae53..bee0ecf 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -21,7 +21,6 @@
WebPolicyDecisionListener *listener;
NSURLResponse *policyResponse;
NSURLConnectionDelegateProxy *proxy;
- NSURLRequest *_initialRequest;
}
- (id)initWithDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index ccd3ec1..69ae773 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -50,8 +50,6 @@
- (void)dealloc
{
- [_initialRequest release];
-
[proxy setDelegate:nil];
[proxy release];
@@ -313,16 +311,14 @@
[self receivedError:error];
}
-- (void)loadWithRequestNow:(NSURLRequest *)r
+- (BOOL)loadWithRequest:(NSURLRequest *)r
{
ASSERT(connection == nil);
- ASSERT(![self defersCallbacks]);
- ASSERT(![[dataSource _webView] defersCallbacks]);
// Send this synthetic delegate callback since clients expect it, and
// we no longer send the callback from within NSURLConnection for
// initial requests.
- r = [self connection:nil willSendRequest:r redirectResponse:nil];
+ r = [proxy connection:nil willSendRequest:r redirectResponse:nil];
NSURL *URL = [r URL];
BOOL shouldLoadEmpty = [URL _webkit_shouldLoadAsEmptyDocument];
@@ -334,25 +330,15 @@
MIMEType = [WebView _generatedMIMETypeForURLScheme:[URL scheme]];
}
- NSURLResponse *resp = [[NSURLResponse alloc] initWithURL:URL MIMEType:MIMEType
+ NSURLResponse *resp = [[NSURLResponse alloc] initWithURL:URL MIMEType:MIMEType
expectedContentLength:0 textEncodingName:nil];
[self connection:nil didReceiveResponse:resp];
[resp release];
} else {
connection = [[NSURLConnection alloc] initWithRequest:r delegate:proxy];
- }
-}
-
-- (BOOL)loadWithRequest:(NSURLRequest *)r
-{
- ASSERT(connection == nil);
-
- if (![self defersCallbacks]) {
- [self loadWithRequestNow:r];
- } else {
- NSURLRequest *copy = [r copy];
- [_initialRequest release];
- _initialRequest = copy;
+ if ([self defersCallbacks]) {
+ [connection setDefersCallbacks:YES];
+ }
}
return YES;
@@ -360,15 +346,13 @@
- (void)setDefersCallbacks:(BOOL)defers
{
- [super setDefersCallbacks:defers];
- if (!defers) {
- NSURLRequest *r = _initialRequest;
- if (r != nil) {
- _initialRequest = nil;
- [self loadWithRequestNow:r];
- [r release];
- }
+ if (request
+ && ![[request URL] _webkit_shouldLoadAsEmptyDocument]
+ && ![WebView _representationExistsForURLScheme:[[request URL] scheme]]) {
+ [super setDefersCallbacks:defers];
}
}
+
@end
+
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index a62ae53..bee0ecf 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -21,7 +21,6 @@
WebPolicyDecisionListener *listener;
NSURLResponse *policyResponse;
NSURLConnectionDelegateProxy *proxy;
- NSURLRequest *_initialRequest;
}
- (id)initWithDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index ccd3ec1..69ae773 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -50,8 +50,6 @@
- (void)dealloc
{
- [_initialRequest release];
-
[proxy setDelegate:nil];
[proxy release];
@@ -313,16 +311,14 @@
[self receivedError:error];
}
-- (void)loadWithRequestNow:(NSURLRequest *)r
+- (BOOL)loadWithRequest:(NSURLRequest *)r
{
ASSERT(connection == nil);
- ASSERT(![self defersCallbacks]);
- ASSERT(![[dataSource _webView] defersCallbacks]);
// Send this synthetic delegate callback since clients expect it, and
// we no longer send the callback from within NSURLConnection for
// initial requests.
- r = [self connection:nil willSendRequest:r redirectResponse:nil];
+ r = [proxy connection:nil willSendRequest:r redirectResponse:nil];
NSURL *URL = [r URL];
BOOL shouldLoadEmpty = [URL _webkit_shouldLoadAsEmptyDocument];
@@ -334,25 +330,15 @@
MIMEType = [WebView _generatedMIMETypeForURLScheme:[URL scheme]];
}
- NSURLResponse *resp = [[NSURLResponse alloc] initWithURL:URL MIMEType:MIMEType
+ NSURLResponse *resp = [[NSURLResponse alloc] initWithURL:URL MIMEType:MIMEType
expectedContentLength:0 textEncodingName:nil];
[self connection:nil didReceiveResponse:resp];
[resp release];
} else {
connection = [[NSURLConnection alloc] initWithRequest:r delegate:proxy];
- }
-}
-
-- (BOOL)loadWithRequest:(NSURLRequest *)r
-{
- ASSERT(connection == nil);
-
- if (![self defersCallbacks]) {
- [self loadWithRequestNow:r];
- } else {
- NSURLRequest *copy = [r copy];
- [_initialRequest release];
- _initialRequest = copy;
+ if ([self defersCallbacks]) {
+ [connection setDefersCallbacks:YES];
+ }
}
return YES;
@@ -360,15 +346,13 @@
- (void)setDefersCallbacks:(BOOL)defers
{
- [super setDefersCallbacks:defers];
- if (!defers) {
- NSURLRequest *r = _initialRequest;
- if (r != nil) {
- _initialRequest = nil;
- [self loadWithRequestNow:r];
- [r release];
- }
+ if (request
+ && ![[request URL] _webkit_shouldLoadAsEmptyDocument]
+ && ![WebView _representationExistsForURLScheme:[[request URL] scheme]]) {
+ [super setDefersCallbacks:defers];
}
}
+
@end
+
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list