[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:20:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5d5acc1ff42dd0ecd9dae9b1338302b968f74da0
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jun 19 21:18:52 2002 +0000
- fixed 2960677 -- attempt to insert nil key; content policy set twice on particular page.
The problem here was a bad URL not being propogated through the error-handling machinery
correctly because the url handle was nil, but used to get its string.
* WebCoreSupport.subproj/IFResourceURLHandleClient.m:
(+[IFResourceURLHandleClient startLoadingResource:withURL:dataSource:]):
* WebView.subproj/IFWebControllerPrivate.mm: Use IFError init method that takes
failingURL.
(-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
(-[IFWebController _receivedError:forResourceHandle:partialProgress:fromDataSource:]):
Check [error failingURL] when resource handle is nil.
- fixed 2962304 -- No URL shown in Activity Window for certain error types
* WebController.m:
(-[WebController receivedError:forResourceHandle:partialProgress:fromDataSource:]):
Get the URL's string from [error failingURL] when handle is nil. This obviates
earlier workaround.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1405 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d220ec7..df8e6c9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-06-19 John Sullivan <sullivan at apple.com>
+
+ - fixed 2960677 -- attempt to insert nil key; content policy set twice on particular page.
+
+ The problem here was a bad URL not being propogated through the error-handling machinery
+ correctly because the url handle was nil, but used to get its string.
+
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (+[IFResourceURLHandleClient startLoadingResource:withURL:dataSource:]):
+ * WebView.subproj/IFWebControllerPrivate.mm: Use IFError init method that takes
+ failingURL.
+
+ (-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[IFWebController _receivedError:forResourceHandle:partialProgress:fromDataSource:]):
+ Check [error failingURL] when resource handle is nil.
+
2002-06-19 Darin Adler <darin at apple.com>
Fixed a storage leak and made some other changes to go along with
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d220ec7..df8e6c9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-06-19 John Sullivan <sullivan at apple.com>
+
+ - fixed 2960677 -- attempt to insert nil key; content policy set twice on particular page.
+
+ The problem here was a bad URL not being propogated through the error-handling machinery
+ correctly because the url handle was nil, but used to get its string.
+
+ * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+ (+[IFResourceURLHandleClient startLoadingResource:withURL:dataSource:]):
+ * WebView.subproj/IFWebControllerPrivate.mm: Use IFError init method that takes
+ failingURL.
+
+ (-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[IFWebController _receivedError:forResourceHandle:partialProgress:fromDataSource:]):
+ Check [error failingURL] when resource handle is nil.
+
2002-06-19 Darin Adler <darin at apple.com>
Fixed a storage leak and made some other changes to go along with
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
index 4ee225c..57446e6 100644
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
+++ b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
@@ -73,7 +73,8 @@
[rLoader cancel];
IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
- inDomain:IFErrorCodeDomainWebFoundation isTerminal:YES];
+ inDomain:IFErrorCodeDomainWebFoundation
+ failingURL:URL isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
partialProgress:nil fromDataSource:source];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 4ee225c..57446e6 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -73,7 +73,8 @@
[rLoader cancel];
IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
- inDomain:IFErrorCodeDomainWebFoundation isTerminal:YES];
+ inDomain:IFErrorCodeDomainWebFoundation
+ failingURL:URL isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
partialProgress:nil fromDataSource:source];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 4ee225c..57446e6 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -73,7 +73,8 @@
[rLoader cancel];
IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
- inDomain:IFErrorCodeDomainWebFoundation isTerminal:YES];
+ inDomain:IFErrorCodeDomainWebFoundation
+ failingURL:URL isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
partialProgress:nil fromDataSource:source];
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index 531b13d..ddecf94 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -73,8 +73,15 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
if (frame != nil) {
+ NSString *resourceString;
IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ if (resourceHandle != nil) {
+ resourceString = [[resourceHandle url] absoluteString];
+ } else {
+ WEBKIT_ASSERT ([error failingURL] != nil);
+ resourceString = [[error failingURL] absoluteString];
+ }
[dataSource _addError: error forResource: [[resourceHandle url] absoluteString]];
[error release];
[frame _checkLoadComplete];
@@ -160,7 +167,8 @@
WEBKIT_ASSERT (frame != nil);
- [dataSource _addError: error forResource: [[resourceHandle url] absoluteString]];
+ [dataSource _addError: error forResource:
+ (resourceHandle != nil ? [[resourceHandle url] absoluteString] : [[error failingURL] absoluteString])];
[frame _checkLoadComplete];
}
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 531b13d..ddecf94 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -73,8 +73,15 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
if (frame != nil) {
+ NSString *resourceString;
IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ if (resourceHandle != nil) {
+ resourceString = [[resourceHandle url] absoluteString];
+ } else {
+ WEBKIT_ASSERT ([error failingURL] != nil);
+ resourceString = [[error failingURL] absoluteString];
+ }
[dataSource _addError: error forResource: [[resourceHandle url] absoluteString]];
[error release];
[frame _checkLoadComplete];
@@ -160,7 +167,8 @@
WEBKIT_ASSERT (frame != nil);
- [dataSource _addError: error forResource: [[resourceHandle url] absoluteString]];
+ [dataSource _addError: error forResource:
+ (resourceHandle != nil ? [[resourceHandle url] absoluteString] : [[error failingURL] absoluteString])];
[frame _checkLoadComplete];
}
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 531b13d..ddecf94 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -73,8 +73,15 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
if (frame != nil) {
+ NSString *resourceString;
IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
+ if (resourceHandle != nil) {
+ resourceString = [[resourceHandle url] absoluteString];
+ } else {
+ WEBKIT_ASSERT ([error failingURL] != nil);
+ resourceString = [[error failingURL] absoluteString];
+ }
[dataSource _addError: error forResource: [[resourceHandle url] absoluteString]];
[error release];
[frame _checkLoadComplete];
@@ -160,7 +167,8 @@
WEBKIT_ASSERT (frame != nil);
- [dataSource _addError: error forResource: [[resourceHandle url] absoluteString]];
+ [dataSource _addError: error forResource:
+ (resourceHandle != nil ? [[resourceHandle url] absoluteString] : [[error failingURL] absoluteString])];
[frame _checkLoadComplete];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list