[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ac34d71b6a61fdbd6f52360c71c98f488038576d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Apr 1 23:49:21 2002 +0000
* Misc.subproj/IFError.h: Add the failing URL to IFError.
* Misc.subproj/IFError.m: (-[IFError initWithErrorCode:]): Call through
with nil for the URL.
(-[IFError initWithErrorCode:failingURL:]): Retain the passed URL.
(-[IFError dealloc]): Autorelease the URL.
(-[IFError failingURL]): Return the URL.
(-[IFError description]): Include the URL in the description.
* WebView.subproj/IFBaseWebControllerPrivate.mm:
(-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]),
(-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
Put the URL into the IFError.
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
Put the URL into the IFError.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@925 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4647cd8..1312688 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2002-04-01 Darin Adler <darin at apple.com>
+
+ * Misc.subproj/IFError.h: Add the failing URL to IFError.
+ * Misc.subproj/IFError.m: (-[IFError initWithErrorCode:]): Call through
+ with nil for the URL.
+ (-[IFError initWithErrorCode:failingURL:]): Retain the passed URL.
+ (-[IFError dealloc]): Autorelease the URL.
+ (-[IFError failingURL]): Return the URL.
+ (-[IFError description]): Include the URL in the description.
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]),
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ Put the URL into the IFError.
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Put the URL into the IFError.
+
2002-04-01 Richard Williamson <rjw at apple.com>
Added more logging to show time of layouts.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4647cd8..1312688 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-04-01 Darin Adler <darin at apple.com>
+
+ * Misc.subproj/IFError.h: Add the failing URL to IFError.
+ * Misc.subproj/IFError.m: (-[IFError initWithErrorCode:]): Call through
+ with nil for the URL.
+ (-[IFError initWithErrorCode:failingURL:]): Retain the passed URL.
+ (-[IFError dealloc]): Autorelease the URL.
+ (-[IFError failingURL]): Return the URL.
+ (-[IFError description]): Include the URL in the description.
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]),
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ Put the URL into the IFError.
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Put the URL into the IFError.
+
2002-04-01 Richard Williamson <rjw at apple.com>
Added more logging to show time of layouts.
diff --git a/WebKit/Misc.subproj/IFError.h b/WebKit/Misc.subproj/IFError.h
index 71e6486..7feb3e7 100644
--- a/WebKit/Misc.subproj/IFError.h
+++ b/WebKit/Misc.subproj/IFError.h
@@ -1,6 +1,6 @@
/*
IFError.h
- Copyright 2001, Apple, Inc. All rights reserved.
+ Copyright 2001, 2002, Apple, Inc. All rights reserved.
Public header file.
*/
@@ -9,10 +9,13 @@
@interface IFError : NSObject
{
int errorCode;
+ NSURL *_failingURL;
}
- initWithErrorCode: (int)c;
+- initWithErrorCode: (int)c failingURL: (NSURL *)url;
- (int)errorCode;
- (NSString *)errorDescription;
+- (NSURL *)failingURL;
@end
diff --git a/WebKit/Misc.subproj/IFError.m b/WebKit/Misc.subproj/IFError.m
index a8f92dd..cdc8c7f 100644
--- a/WebKit/Misc.subproj/IFError.m
+++ b/WebKit/Misc.subproj/IFError.m
@@ -122,11 +122,23 @@ static id IFErrorMake(int code)
- initWithErrorCode: (int)c
{
+ return [self initWithErrorCode: c failingURL: nil];
+}
+
+- initWithErrorCode: (int)c failingURL: (NSURL *)url;
+{
[super init];
errorCode = c;
+ _failingURL = [url retain];
return self;
}
+- (void)dealloc
+{
+ [_failingURL autorelease];
+ [super dealloc];
+}
+
- (int)errorCode
{
return errorCode;
@@ -137,9 +149,14 @@ static id IFErrorMake(int code)
return [descriptions objectForKey: [NSNumber numberWithInt: errorCode]];
}
+- (NSURL *)failingURL
+{
+ return _failingURL;
+}
+
- (NSString *)description
{
- return [NSString stringWithFormat: @"code %d: %@", errorCode, [self errorDescription]];
+ return [NSString stringWithFormat: @"url %@, code %d: %@", [_failingURL absoluteString], errorCode, [self errorDescription]];
}
@end
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 2514855..a79575a 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -45,8 +45,10 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
- if (frame != nil)
- [frame _checkLoadCompleteResource: resourceDescription error: [[[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled] autorelease] isMainDocument: NO];
+ if (frame != nil) {
+ IFError *error = [[[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled failingURL: [dataSource inputURL]] autorelease];
+ [frame _checkLoadCompleteResource: resourceDescription error: error isMainDocument: NO];
+ }
return;
}
// This resouce has completed, so check if the load is complete for all frames.
@@ -69,8 +71,10 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
[dataSource _setPrimaryLoadComplete: YES];
- if (frame != nil);
- [frame _checkLoadCompleteResource: resourceDescription error: [[[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled] autorelease] isMainDocument: YES];
+ if (frame != nil) {
+ IFError *error = [[[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled failingURL: [dataSource inputURL]] autorelease];
+ [frame _checkLoadCompleteResource: resourceDescription error: error isMainDocument: YES];
+ }
return;
}
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 66b8353..07ec3e8 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -72,7 +72,7 @@
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [[sender availableResourceData] length];
- IFError *error = [[IFError alloc] initWithErrorCode: result];
+ IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
[error release];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 66b8353..07ec3e8 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -72,7 +72,7 @@
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [[sender availableResourceData] length];
- IFError *error = [[IFError alloc] initWithErrorCode: result];
+ IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
[error release];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 66b8353..07ec3e8 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -72,7 +72,7 @@
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [[sender availableResourceData] length];
- IFError *error = [[IFError alloc] initWithErrorCode: result];
+ IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
[error release];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list