[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:12:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3824973dd58a1299fd8031f69cc9fe6db3e30d7a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 10 21:07:29 2002 +0000
2002-05-10 Kenneth Kocienda <kocienda at apple.com>
Reviewed by: Maciej Stachowiak
WebFoundation:
This set of changes enhances the IFError object with two new pieces of
information:
1) An error domain, to help separate error codes from different
sources that may overlap
2) An indicator of whether the error should be treated as "terminal" by
code that receives and handles the error.
I have added a couple of other cleanups in this class, as described by
the bugs noted below.
The other code in this set of changes was modified to use the new interface
and features of IFError.
Fixes for these four bugs:
Radar 2923998 (Change IFError private data into a pointer to a private data object)
Radar 2924002 (IFError should include an error domain)
Radar 2924013 (IFError initialization is not threadsafe)
Radar 2924280 (IFError should contain a new field which tells whether the error is terminal)
* CacheLoader.subproj/IFFileURLProtocolHandler.m:
(-[IFFileURLProtocolHandler fileLoadThread])
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
(-[IFHTTPURLProtocolHandler continueBeginLoadInBackgroundAfterCreatingHTTPRequest])
(-[IFHTTPURLProtocolHandler retryWithRedirectedURL:])
(-[IFHTTPURLProtocolHandler handleReadStreamEvent:event:])
(-[IFHTTPURLProtocolHandler performHTTPHeaderRead:])
(-[IFHTTPURLProtocolHandler determineErrorAndFail])
* CacheLoader.subproj/IFURLCacheLoaderConstants.:h
* CacheLoader.subproj/IFURLHandle.m:
(-[IFURLHandle _backgroundLoadFailedWithResultCode:inDomain:isTerminal:])
(-[IFURLHandle _setError:])
(-[IFURLHandle _notifyClientsDidFailLoading])
* CacheLoader.subproj/IFURLHandleC.h:
* CacheLoader.subproj/IFURLHandleC.m:
(IFURLHandleBackgroundLoadFailedWithResultCode)
* CacheLoader.subproj/IFURLHandlePrivate.h:
* CacheLoader.subproj/IFURLLoad.h:
* CacheLoader.subproj/IFURLLoad.m:
(-[IFURLLoad failedWithResultCode:inDomain:isTerminal:])
(-[IFURLLoad scheduleOriginLoad])
(-[IFURLLoad beginOriginLoad])
(_loadSweeper)
* Misc.subproj/IFError.h:
* Misc.subproj/IFError.m:
(-[IFErrorPrivate dealloc])
(classInitialize)
(+[IFError errorWithCode:inDomain:failingURL:isTerminal:])
(-[IFError initWithErrorCode:inDomain:failingURL:isTerminal:])
(-[IFError dealloc])
(-[IFError errorCode])
(-[IFError errorDomain])
(-[IFError terminalError])
(-[IFError errorDescription])
(-[IFError failingURL])
(-[IFError description])
WebKit:
This code was modified to use the new interface and features of IFError.
These features and changes are described in these four bug reports:
Radar 2923998 (Change IFError private data into a pointer to a private data object)
Radar 2924002 (IFError should include an error domain)
Radar 2924013 (IFError initialization is not threadsafe)
Radar 2924280 (IFError should contain a new field which tells whether the error is terminal)
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView IFURLHandle:resourceDidFailLoadingWithResult:])
* WebView.subproj/IFBaseWebControllerPrivate.mm:
(-[IFBaseWebController _receivedProgress:forResource:fromDataSource:])
(-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:])
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:])
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1585d21..d5eb6f9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-05-10 Kenneth Kocienda <kocienda at apple.com>
+
+ Reviewed by: Maciej Stachowiak
+
+ This code was modified to use the new interface and features of IFError.
+ These features and changes are described in these four bug reports:
+
+ Radar 2923998 (Change IFError private data into a pointer to a private data object)
+ Radar 2924002 (IFError should include an error domain)
+ Radar 2924013 (IFError initialization is not threadsafe)
+ Radar 2924280 (IFError should contain a new field which tells whether the error is terminal)
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+
2002-05-09 Richard J. Williamson <rjw at apple.com>
Tuned implementation more. Cleaned up and factored code.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1585d21..d5eb6f9 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-05-10 Kenneth Kocienda <kocienda at apple.com>
+
+ Reviewed by: Maciej Stachowiak
+
+ This code was modified to use the new interface and features of IFError.
+ These features and changes are described in these four bug reports:
+
+ Radar 2923998 (Change IFError private data into a pointer to a private data object)
+ Radar 2924002 (IFError should include an error domain)
+ Radar 2924013 (IFError initialization is not threadsafe)
+ Radar 2924280 (IFError should contain a new field which tells whether the error is terminal)
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+
2002-05-09 Richard J. Williamson <rjw at apple.com>
Tuned implementation more. Cleaned up and factored code.
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index a2af5ed..ad22df8 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -622,7 +622,7 @@ newCString(NSString *string)
loadProgress->bytesSoFar = [sender contentLengthReceived];
loadProgress->type = IF_LOAD_TYPE_PLUGIN;
- IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
+ IFError *error = [[IFError alloc] initWithErrorCode: result inDomain:IFErrorCodeDomainWebFoundation failingURL: [sender url]];
[webController receivedError: error forResource: [[sender url] absoluteString]
partialProgress: loadProgress fromDataSource: webDataSource];
[error release];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index a2af5ed..ad22df8 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -622,7 +622,7 @@ newCString(NSString *string)
loadProgress->bytesSoFar = [sender contentLengthReceived];
loadProgress->type = IF_LOAD_TYPE_PLUGIN;
- IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
+ IFError *error = [[IFError alloc] initWithErrorCode: result inDomain:IFErrorCodeDomainWebFoundation failingURL: [sender url]];
[webController receivedError: error forResource: [[sender url] absoluteString]
partialProgress: loadProgress fromDataSource: webDataSource];
[error release];
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 19e7c1d..1450b2f 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -69,7 +69,7 @@
if (progress->bytesSoFar == -1 && progress->totalToLoad == -1){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
if (frame != nil) {
- IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled failingURL: [dataSource inputURL]];
+ IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
[dataSource _addError: error forResource: resourceDescription];
[error release];
[frame _checkLoadComplete];
@@ -98,7 +98,7 @@
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelled resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
[dataSource _setPrimaryLoadComplete: YES];
if (frame != nil) {
- IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled failingURL: [dataSource inputURL]];
+ IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultCancelled inDomain:IFErrorCodeDomainWebFoundation failingURL: [dataSource inputURL]];
[dataSource _setMainDocumentError: error];
[error release];
[frame _checkLoadComplete];
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index e648978..847982d 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -150,7 +150,7 @@
else if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
// can't show a type that we don't handle
- [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType]];
+ [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType inDomain:IFErrorCodeDomainCustom isTerminal:YES]];
}
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index e648978..847982d 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -150,7 +150,7 @@
else if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
// can't show a type that we don't handle
- [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType]];
+ [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType inDomain:IFErrorCodeDomainCustom isTerminal:YES]];
}
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index e648978..847982d 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -150,7 +150,7 @@
else if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
// can't show a type that we don't handle
- [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType]];
+ [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType inDomain:IFErrorCodeDomainCustom isTerminal:YES]];
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list