[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 07:39:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1f8a698f28d88bb30d4f5faed208b2ea3ca71582
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 1 03:52:28 2003 +0000
Tests:
Reviewed by Richard
Modified WebFoundation error constant names. Names
now begin with NSURLError prefix.
* PictureBrowser/PictureBrowserProtocol.m:
(-[PictureBrowserProtocol startLoading]):
WebFoundation:
Reviewed by Richard
Modified WebFoundation error constant names. Names
now begin with NSURLError prefix.
* CacheLoader.subproj/NSURLConnection.m:
(-[NSURLConnection _beginLoad]):
(-[NSURLConnection _prepareOriginLoad]):
(-[NSURLConnection _performTimeOut]):
(-[NSURLConnection _wasRedirectedToRequest:redirectResponse:]):
* CacheLoader.subproj/WebSynchronousDelegate.m:
(-[WebSynchronousDelegate run:]):
* FileTransfer.subproj/NSURLDownload.m:
(-[NSURLDownload setDestination:allowOverwrite:]):
(-[NSURLDownload connectionDidFinishLoading:]):
(-[NSURLDownload _decodeData:]):
(-[NSURLDownload _writeDataForkData:resourceForkData:]):
(-[NSURLDownload _errorWithCode:]):
(WriteCompletionCallback):
(CloseCompletionCallback):
* Misc.subproj/WebFoundation.h:
* Misc.subproj/WebNSErrorExtras.h:
* Misc.subproj/WebNSErrorExtras.m:
(WebNSErrorExtrasInit):
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
(-[WebCFNetworkHTTPProtocol continueBeginLoadInBackgroundAfterCreatingHTTPRequest]):
* ProtocolHandlers.subproj/WebFTPProtocol.m:
(-[WebFTPProtocol startLoading]):
(-[WebFTPProtocol determineErrorAndFail]):
(-[WebFTPProtocol _checkDirectoryListing]):
* ProtocolHandlers.subproj/WebFileProtocol.m:
(-[WebFileProtocol startLoading]):
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol startLoading]):
(-[WebHTTPProtocol cachedResponseRevalidated]):
(-[WebHTTPProtocol determineTransferEncoding]):
(-[WebHTTPProtocol determineErrorAndFail]):
(-[WebHTTPProtocol retryWithRedirectedURLAndResultCode:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(-[WebSimpleHTTPProtocol _continueLoadingWithAddressInfo]):
(-[WebSimpleHTTPProtocol hostNameResolved:]):
(-[WebSimpleHTTPProtocol _processRawData]):
(-[WebSimpleHTTPProtocol _handleLoadCallback]):
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
* Misc.subproj/WebNSErrorConstants.h: Removed
WebKit:
Reviewed by Richard
Modified WebFoundation error constant names. Names
now begin with NSURLError prefix.
* Plugins.subproj/WebNetscapePluginRepresentation.m:
(-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate cancelledError]):
* WebView.subproj/WebDataProtocol.m:
(-[WebDataProtocol startLoading]):
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _stopLoadingInternal]):
WebBrowser:
Reviewed by Richard
Modified WebFoundation error constant names. Names
now begin with NSURLError prefix.
* BrowserNSErrorExtras.m:
(-[NSError isCancelledError]):
* DownloadMonitor.m:
(-[DownloadMonitor download:didReceiveResponse:]):
* DownloadProgressEntry.m:
(-[DownloadProgressEntry stop]):
* LocationChangeError.m:
(-[LocationChangeHandler specializedTitleForError:]):
(-[LocationChangeHandler specializedMessageForError:dataSource:]):
(-[LocationChangeHandler displayLocationChangeError:forDataSource:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler webView:locationChangeDone:forDataSource:]):
* ResourceProgressEntry.m:
(-[ResourceProgressEntry stage]):
* WebBookmarkImporter.m:
(-[WebBookmarkImporter initWithPath:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e848dad..e6f78a1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,24 @@
Reviewed by Richard
+ Modified WebFoundation error constant names. Names
+ now begin with NSURLError prefix.
+
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ (-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate cancelledError]):
+ * WebView.subproj/WebDataProtocol.m:
+ (-[WebDataProtocol startLoading]):
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _stopLoadingInternal]):
+
+2003-04-30 Kenneth Kocienda <kocienda at apple.com>
+
+ Reviewed by Richard
+
Use NSURLResponse new SPI methods to set instance variables.
* WebView.subproj/WebBaseResourceHandleDelegate.m:
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index f697b2f..ebf18e4 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -69,7 +69,7 @@
return;
}
- if ([error code] == WebFoundationErrorCancelled) {
+ if ([error code] == NSURLErrorCancelled) {
[self receivedError:NPRES_USER_BREAK];
} else {
[self receivedError:NPRES_NETWORK_ERR];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 7e32398..c1ee7cd 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -65,8 +65,8 @@
[rLoader reportError];
- NSError *badURLError = [[NSError alloc] _web_initWithDomain:WebFoundationErrorDomain
- code:WebFoundationErrorBadURL
+ NSError *badURLError = [[NSError alloc] _web_initWithDomain:NSURLErrorDomain
+ code:NSURLErrorBadURL
failingURL:[URL absoluteString]];
[_controller _receivedError:badURLError fromDataSource:source];
[badURLError release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 7e32398..c1ee7cd 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -65,8 +65,8 @@
[rLoader reportError];
- NSError *badURLError = [[NSError alloc] _web_initWithDomain:WebFoundationErrorDomain
- code:WebFoundationErrorBadURL
+ NSError *badURLError = [[NSError alloc] _web_initWithDomain:NSURLErrorDomain
+ code:NSURLErrorBadURL
failingURL:[URL absoluteString]];
[_controller _receivedError:badURLError fromDataSource:source];
[badURLError release];
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 2c1414d..bafc32c 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -335,8 +335,8 @@
- (NSError *)cancelledError
{
- return [NSError _web_errorWithDomain:WebFoundationErrorDomain
- code:WebFoundationErrorCancelled
+ return [NSError _web_errorWithDomain:NSURLErrorDomain
+ code:NSURLErrorCancelled
failingURL:[[request URL] absoluteString]];
}
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 95ceaf4..c68cf77 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -193,9 +193,9 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
} else {
int resultCode;
- resultCode = WebFoundationErrorResourceUnavailable;
+ resultCode = NSURLErrorResourceUnavailable;
- [client URLProtocol:self didFailWithError:[NSError _web_errorWithDomain:WebFoundationErrorDomain code:resultCode failingURL:[[request URL] absoluteString]]];
+ [client URLProtocol:self didFailWithError:[NSError _web_errorWithDomain:NSURLErrorDomain code:resultCode failingURL:[[request URL] absoluteString]]];
}
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 93509ff..d4eeb87 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -236,8 +236,8 @@
[_private->mainClient cancel];
}else{
// Main handle is already done. Set the cancelled error.
- NSError *cancelledError = [NSError _web_errorWithDomain:WebFoundationErrorDomain
- code:WebFoundationErrorCancelled
+ NSError *cancelledError = [NSError _web_errorWithDomain:NSURLErrorDomain
+ code:NSURLErrorCancelled
failingURL:[[self _URL] absoluteString]];
[self _setMainDocumentError:cancelledError];
}
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 2c1414d..bafc32c 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -335,8 +335,8 @@
- (NSError *)cancelledError
{
- return [NSError _web_errorWithDomain:WebFoundationErrorDomain
- code:WebFoundationErrorCancelled
+ return [NSError _web_errorWithDomain:NSURLErrorDomain
+ code:NSURLErrorCancelled
failingURL:[[request URL] absoluteString]];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list