[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:38:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f65be8f27e2ed1f772378cad0285a26ff396d8e4
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 24 18:21:31 2003 +0000
top level:
Reviewed by Darin
Added a configure test for checking OS version. Used
to figure out what exports to use for WebFoundation.
* configure.in
Tests:
Reviewed by Darin
Changed WebError to NSError.
Changed call to errorDescription to localizedDescription to match
new NSError API.
Unrelated change to fix build breakage in PDFRepresentation. It seems
that WebDocumentRepresentation changed but this test was not updated.
* DumpBackForward/main.m:
(-[WaitUntilDoneDelegate webView:locationChangeDone:forDataSource:]):
* DumpRenderTree/main.m:
(-[WaitUntilDoneDelegate webView:locationChangeDone:forDataSource:]):
* PDFViewer/DocumentController.m:
(-[DocumentController webView:locationChangeDone:forDataSource:]):
(-[DocumentController webView:resource:didFailLoadingWithError:fromDataSource:]):
* PDFViewer/PDFRepresentation.m:
(-[PDFRepresentation receivedError:withDataSource:]):
(-[PDFView menuForEvent:]):
(-[PDFView viewWillMoveToHostWindow:]):
(-[PDFView viewDidMoveToHostWindow]):
* SimpleViewer/DocumentController.m:
(-[DocumentController webView:locationChangeDone:forDataSource:]):
(-[DocumentController webView:resource:didFailLoadingWithError:fromDataSource:]):
* SnippetEditor/SnippetController.h:
* SnippetEditor/SnippetController.m:
(-[SnippetController receivedError:]):
(-[SnippetController webView:locationChangeDone:forDataSource:]):
WebFoundation:
Reviewed by Darin
Changed WebError to NSError.
Removed WebFoundation.exp. File with this name is now generated and
is listed in .cvsignore.
Added build mojo to handle making the correct exports for the
framework based on whether we are running on Jaguar or Panther
(or later). If we are on Jaguar, we need to export the NSError
class we build and include in the framework. Also note that
there is build mojo that works both for our local builds and
for B&I builds.
* .cvsignore:
* AuthenticationManager.subproj/NSURLCredentialStorage.m:
* CacheLoader.subproj/NSURLConnection.h:
* CacheLoader.subproj/NSURLConnection.m:
(-[NSURLConnection _sendDidFailLoadingCallback]):
(-[NSURLConnection _beginLoad]):
(-[NSURLConnection _prepareOriginLoad]):
(-[NSURLConnection _performTimeOut]):
(-[NSURLConnection _wasRedirectedToRequest:redirectResponse:]):
(-[NSURLConnection _didFailWithError:]):
(-[NSURLConnection _setError:]):
(-[NSURLConnectionInternal URLProtocol:didFailWithError:]):
* CacheLoader.subproj/NSURLProtocol.h:
* CacheLoader.subproj/NSURLResponse.h:
* CacheLoader.subproj/NSURLResponse.m:
* CacheLoader.subproj/WebSynchronousDelegate.h:
* CacheLoader.subproj/WebSynchronousDelegate.m:
(-[WebSynchronousDelegate run:]):
(-[WebSynchronousDelegate error]):
* ChangeLog:
* English.lproj/StringsNotToBeLocalized.txt:
* Makefile.am:
* Misc.subproj/NSError.h: Added.
* Misc.subproj/NSError.m: Added.
(-[NSError initWithDomain:code:userInfo:]):
(+[NSError errorWithDomain:code:userInfo:]):
(-[NSError code]):
(-[NSError domain]):
(-[NSError userInfo]):
(-[NSError localizedDescription]):
(-[NSError description]):
(-[NSError copyWithZone:]):
(-[NSError encodeWithCoder:]):
(-[NSError initWithCoder:]):
* Misc.subproj/WebError.h:
* Misc.subproj/WebError.m:
(-[WebError errorDescription]):
* Misc.subproj/WebFoundation.h:
* Misc.subproj/WebNSErrorConstants.h: Added.
* Misc.subproj/WebNSErrorExtras.h: Added.
* Misc.subproj/WebNSErrorExtras.m: Added.
(WebNSErrorExtrasInit):
(+[NSError _web_addErrorsWithCodesAndDescriptions:inDomain:]):
(+[NSError _web_errorWithDomain:code:failingURL:]):
(-[NSError _web_initWithDomain:code:failingURL:]):
(-[NSError _web_errorIsInDomain:]):
(-[NSError _web_localizedDescription]):
(-[NSError _web_failingURL]):
* 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.h:
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol startLoading]):
(-[WebHTTPProtocol cachedResponseRevalidated]):
(-[WebHTTPProtocol failWithError:]):
(-[WebHTTPProtocol determineTransferEncoding]):
(-[WebHTTPProtocol determineErrorAndFail]):
(-[WebHTTPProtocol retryWithRedirectedURLAndResultCode:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(-[WebSimpleHTTPProtocol _continueLoadingWithAddressInfo]):
(-[WebSimpleHTTPProtocol hostNameResolved:]):
(-[WebSimpleHTTPProtocol _processRawData]):
(-[WebSimpleHTTPProtocol _handleLoadCallback]):
(-[WebSimpleHTTPProtocol failWithError:]):
* WebFoundation-base.exp: Added.
* WebFoundation-jaguar.exp: Added.
* WebFoundation.exp: Removed.
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by Darin
Changed WebError to NSError
* Downloads.subproj/WebDownload.h:
* Downloads.subproj/WebDownload.m:
(-[WebDownload connection:didReceiveData:]):
(-[WebDownload connectionDidFinishLoading:]):
(-[WebDownload connection:didFailLoadingWithError:]):
(-[WebDownload _decodeData:]):
(-[WebDownload _writeDataForkData:resourceForkData:]):
(-[WebDownload _didCloseFile:]):
(-[WebDownload _cancelWithError:]):
(-[WebDownload _errorWithCode:]):
(CloseCompletionCallback):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader connection:didFailLoadingWithError:]):
* Misc.subproj/WebKitErrors.h:
* Misc.subproj/WebKitErrors.m:
(+[NSError _webKitErrorWithCode:failingURL:]):
(registerErrors):
* Misc.subproj/WebKitErrorsPrivate.h:
* Plugins.subproj/WebNetscapePluginRepresentation.h:
* Plugins.subproj/WebNetscapePluginRepresentation.m:
(-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream connection:didFailLoadingWithError:]):
* Plugins.subproj/WebPlugInError.h:
* Plugins.subproj/WebPlugInError.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
(-[WebSubresourceClient receivedError:]):
(-[WebSubresourceClient connection:didFailLoadingWithError:]):
* WebKit.exp:
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate connection:didFailLoadingWithError:]):
(-[WebBaseResourceHandleDelegate cancelWithError:]):
(-[WebBaseResourceHandleDelegate cancelledError]):
* WebView.subproj/WebDataProtocol.m:
(-[WebDataProtocol startLoading]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _stopLoadingInternal]):
(-[WebDataSource _setMainDocumentError:]):
(-[WebDataSource _receivedError:complete:]):
(-[WebDataSource _stopLoadingWithError:]):
(-[WebDataSource _mainDocumentError]):
* WebView.subproj/WebDefaultLocationChangeDelegate.m:
(-[WebDefaultLocationChangeDelegate webView:locationChangeDone:forDataSource:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate webView:unableToImplementPolicyWithError:frame:]):
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:resource:didFailLoadingWithError:fromDataSource:]):
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _handleUnimplementablePolicyWithErrorCode:forURL:]):
* WebView.subproj/WebFrameView.m:
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation receivedError:withDataSource:]):
* WebView.subproj/WebImageRepresentation.m:
(-[WebImageRepresentation receivedError:withDataSource:]):
* WebView.subproj/WebLocationChangeDelegate.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient receivedError:]):
(-[WebMainResourceClient cancelWithError:]):
(-[WebMainResourceClient interruptForPolicyChangeError]):
(-[WebMainResourceClient connection:didFailLoadingWithError:]):
(-[WebResourceDelegateProxy connection:didFailLoadingWithError:]):
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebTextRepresentation.m:
(-[WebTextRepresentation receivedError:withDataSource:]):
* WebView.subproj/WebView.h:
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
(-[WebView _receivedError:fromDataSource:]):
(-[WebView _mainReceivedError:fromDataSource:complete:]):
WebBrowser:
Reviewed by Darin
Changed WebError to NSError.
* BrowserDocument.m:
* BrowserWebController.m:
(-[BrowserWebController webView:unableToImplementPolicyWithError:frame:]):
(-[BrowserWebController openURLExternallyWithRequest:inFrame:]):
* BugReportController.m:
(-[BugReportController connection:didFailLoadingWithError:]):
* Debug/SnippetController.m:
(-[SnippetController webView:locationChangeDone:forDataSource:]):
* DownloadMonitor.h:
* DownloadMonitor.m:
(-[DownloadMonitor download:didReceiveResponse:]):
(-[DownloadMonitor download:didFailDownloadingWithError:]):
(-[DownloadMonitor cancelDownload:withError:]):
(-[DownloadMonitor handleDiskCopyEvent:withReplyEvent:]):
* DownloadProgressEntry.m:
(-[DownloadProgressEntry dictionaryRepresentation]):
(-[DownloadProgressEntry stop]):
* DownloadRow.m:
* FrameProgressEntry.h:
* FrameProgressEntry.m:
(-[FrameProgressEntry _setCommittedError:]):
(-[FrameProgressEntry _setProvisionalError:]):
(-[FrameProgressEntry setError:forDataSource:]):
(-[FrameProgressEntry error]):
(-[FrameProgressEntry URL]):
(-[FrameProgressEntry _urlStringForTitle]):
* LoadProgressMonitor.h:
* LoadProgressMonitor.m:
(-[LoadProgressMonitor setError:forDataSource:]):
(-[LoadProgressMonitor webView:plugInFailedWithError:dataSource:]):
* LocationChangeError.h:
* LocationChangeError.m:
(-[LocationChangeHandler specializedTitleForError:]):
(-[LocationChangeHandler specializedMessageForError:dataSource:]):
(-[LocationChangeHandler genericTitleForError:]):
(-[LocationChangeHandler genericMessageForError:]):
(-[LocationChangeHandler displayLocationChangeError:forDataSource:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler webView:locationChangeDone:forDataSource:]):
* ResourceProgressEntry.h:
* ResourceProgressEntry.m:
(+[ResourceProgressEntry entryWithURLString:bytesLoaded:bytesExpected:error:parent:]):
(-[ResourceProgressEntry initWithURLString:bytesLoaded:bytesExpected:error:parent:]):
(-[ResourceProgressEntry error]):
(-[ResourceProgressEntry setError:]):
(-[ResourceProgressEntry stage]):
* WebBookmarkImporter.h:
* WebBookmarkImporter.m:
(-[WebBookmarkImporter initWithPath:]):
(-[WebBookmarkImporter error]):
* WebBrowser.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4175 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cc0701e..4e0a265 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,88 @@
+2003-04-24 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Darin
+
+ Changed WebError to NSError
+
+ * Downloads.subproj/WebDownload.h:
+ * Downloads.subproj/WebDownload.m:
+ (-[WebDownload connection:didReceiveData:]):
+ (-[WebDownload connectionDidFinishLoading:]):
+ (-[WebDownload connection:didFailLoadingWithError:]):
+ (-[WebDownload _decodeData:]):
+ (-[WebDownload _writeDataForkData:resourceForkData:]):
+ (-[WebDownload _didCloseFile:]):
+ (-[WebDownload _cancelWithError:]):
+ (-[WebDownload _errorWithCode:]):
+ (CloseCompletionCallback):
+ * English.lproj/StringsNotToBeLocalized.txt:
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader connection:didFailLoadingWithError:]):
+ * Misc.subproj/WebKitErrors.h:
+ * Misc.subproj/WebKitErrors.m:
+ (+[NSError _webKitErrorWithCode:failingURL:]):
+ (registerErrors):
+ * Misc.subproj/WebKitErrorsPrivate.h:
+ * Plugins.subproj/WebNetscapePluginRepresentation.h:
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ (-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream connection:didFailLoadingWithError:]):
+ * Plugins.subproj/WebPlugInError.h:
+ * Plugins.subproj/WebPlugInError.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ (-[WebSubresourceClient receivedError:]):
+ (-[WebSubresourceClient connection:didFailLoadingWithError:]):
+ * WebKit.exp:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate connection:didFailLoadingWithError:]):
+ (-[WebBaseResourceHandleDelegate cancelWithError:]):
+ (-[WebBaseResourceHandleDelegate cancelledError]):
+ * WebView.subproj/WebDataProtocol.m:
+ (-[WebDataProtocol startLoading]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _stopLoadingInternal]):
+ (-[WebDataSource _setMainDocumentError:]):
+ (-[WebDataSource _receivedError:complete:]):
+ (-[WebDataSource _stopLoadingWithError:]):
+ (-[WebDataSource _mainDocumentError]):
+ * WebView.subproj/WebDefaultLocationChangeDelegate.m:
+ (-[WebDefaultLocationChangeDelegate webView:locationChangeDone:forDataSource:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate webView:unableToImplementPolicyWithError:frame:]):
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:resource:didFailLoadingWithError:fromDataSource:]):
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _handleUnimplementablePolicyWithErrorCode:forURL:]):
+ * WebView.subproj/WebFrameView.m:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation receivedError:withDataSource:]):
+ * WebView.subproj/WebImageRepresentation.m:
+ (-[WebImageRepresentation receivedError:withDataSource:]):
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient receivedError:]):
+ (-[WebMainResourceClient cancelWithError:]):
+ (-[WebMainResourceClient interruptForPolicyChangeError]):
+ (-[WebMainResourceClient connection:didFailLoadingWithError:]):
+ (-[WebResourceDelegateProxy connection:didFailLoadingWithError:]):
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebTextRepresentation.m:
+ (-[WebTextRepresentation receivedError:withDataSource:]):
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _receivedError:fromDataSource:]):
+ (-[WebView _mainReceivedError:fromDataSource:complete:]):
+
2003-04-24 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebKit/Downloads.subproj/WebDownload.h b/WebKit/Downloads.subproj/WebDownload.h
index 3c45264..c1d6da6 100644
--- a/WebKit/Downloads.subproj/WebDownload.h
+++ b/WebKit/Downloads.subproj/WebDownload.h
@@ -7,8 +7,8 @@
#import <Foundation/Foundation.h>
+ at class NSError;
@class WebDownloadPrivate;
- at class WebError;
@class NSURLRequest;
@class NSURLResponse;
@@ -147,7 +147,7 @@
@param download The download that ended in error.
@param error The error caused the download to fail.
*/
-- (void)download:(WebDownload *)download didFailDownloadingWithError:(WebError *)error;
+- (void)download:(WebDownload *)download didFailDownloadingWithError:(NSError *)error;
@end
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index c87da17..7f93af2 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -18,7 +18,7 @@
#import <WebKit/WebNSWorkspaceExtras.h>
#import <WebKit/WebNSURLResponseExtras.h>
-#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/NSURLRequest.h>
@@ -87,15 +87,15 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
#pragma mark DECODING
- (void)_decodeHeaderData:(NSData *)headerData dataForkData:(NSData **)dataForkData resourceForkData:(NSData **)resourceForkData;
- (BOOL)_decodeData:(NSData *)data dataForkData:(NSData **)dataForkData resourceForkData:(NSData **)resourceForkData;
-- (WebError *)_decodeData:(NSData *)data;
+- (NSError *)_decodeData:(NSData *)data;
- (NSData *)_dataIfDoneBufferingData:(NSData *)data;
- (BOOL)_finishDecoding;
#pragma mark WRITING
- (BOOL)_writeForkData:(NSData *)data isDataFork:(BOOL)isDataFork;
-- (WebError *)_writeDataForkData:(NSData *)dataForkData resourceForkData:(NSData *)resourceForkData;
+- (NSError *)_writeDataForkData:(NSData *)dataForkData resourceForkData:(NSData *)resourceForkData;
#pragma mark CLOSING;
- (BOOL)_isFileClosed;
-- (void)_didCloseFile:(WebError *)error;
+- (void)_didCloseFile:(NSError *)error;
- (void)_closeForkAsync:(SInt16)forkRefNum;
- (BOOL)_closeForkSync:(SInt16)forkRefNum;
- (void)_closeFileAsync;
@@ -104,13 +104,13 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
- (void)_didDeleteFile;
- (void)_deleteFileAsnyc;
- (void)_closeAndDeleteFileAsync;
-- (void)_cancelWithError:(WebError *)error;
+- (void)_cancelWithError:(NSError *)error;
- (void)_cancelWithErrorCode:(int)code;
#pragma mark MISC
- (void)_setDelegate:(id)delegate;
- (void)_setPath:(NSString *)path;
- (NSString *)_currentPath;
-- (WebError *)_errorWithCode:(int)code;
+- (NSError *)_errorWithCode:(int)code;
- (SInt16)_dataForkReferenceNumber;
- (void)_setDataForkReferenceNumber:(SInt16)forkRefNum;
- (SInt16)_resourceForkReferenceNumber;
@@ -344,7 +344,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
[_private->delegate download:self didReceiveDataOfLength:[data length]];
}
- WebError *error = [self _decodeData:[self _dataIfDoneBufferingData:data]];
+ NSError *error = [self _decodeData:[self _dataIfDoneBufferingData:data]];
if (error) {
[self _cancelWithError:error];
}
@@ -352,7 +352,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
- (void)connectionDidFinishLoading:(NSURLConnection *)connection
{
- WebError *error = [self _decodeData:_private->bufferedData];
+ NSError *error = [self _decodeData:_private->bufferedData];
[_private->bufferedData release];
_private->bufferedData = nil;
if (error) {
@@ -369,7 +369,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
[self _closeFileAsync];
}
-- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(NSError *)error
{
[self _cancelWithError:error];
}
@@ -574,7 +574,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return YES;
}
-- (WebError *)_decodeData:(NSData *)data
+- (NSError *)_decodeData:(NSData *)data
{
if ([data length] == 0) {
return nil;
@@ -588,7 +588,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return [self _errorWithCode:WebKitErrorDownloadDecodingFailedMidStream];
}
- WebError *error = [self _writeDataForkData:dataForkData resourceForkData:resourceForkData];
+ NSError *error = [self _writeDataForkData:dataForkData resourceForkData:resourceForkData];
if (error) {
return error;
}
@@ -674,7 +674,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return YES;
}
-- (WebError *)_writeDataForkData:(NSData *)dataForkData resourceForkData:(NSData *)resourceForkData
+- (NSError *)_writeDataForkData:(NSData *)dataForkData resourceForkData:(NSData *)resourceForkData
{
if (![self _createFileIfNecessary]) {
return [self _errorWithCode:WebKitErrorCannotCreateFile];
@@ -705,7 +705,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return (_private->dataForkRefNum == 0 && _private->resourceForkRefNum == 0);
}
-- (void)_didCloseFile:(WebError *)error
+- (void)_didCloseFile:(NSError *)error
{
if (_private->deleteFile) {
[self _deleteFileAsnyc];
@@ -798,7 +798,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
}
}
-- (void)_cancelWithError:(WebError *)error
+- (void)_cancelWithError:(NSError *)error
{
[_private->connection cancel];
@@ -882,10 +882,9 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
return _private->path ? _private->path : _private->tempPath;
}
-- (WebError *)_errorWithCode:(int)code
+- (NSError *)_errorWithCode:(int)code
{
- return [WebError _webKitErrorWithCode:code
- failingURL:[[_private->request URL] absoluteString]];
+ return [NSError _webKitErrorWithCode:code failingURL:[[_private->request URL] absoluteString]];
}
- (SInt16)_dataForkReferenceNumber
@@ -969,8 +968,7 @@ static void CloseCompletionCallback(ParmBlkPtr paramBlock)
}
if ([download _isFileClosed]) {
- WebError *error = [download _encounteredCloseError] ?
- [download _errorWithCode:WebKitErrorCannotCloseFile] : nil;
+ NSError *error = [download _encounteredCloseError] ? [download _errorWithCode:WebKitErrorCannotCloseFile] : nil;
[download performSelectorOnMainThread:@selector(_didCloseFile:) withObject:error waitUntilDone:NO];
}
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 2e56488..e5ba342 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -113,7 +113,7 @@
"WebElementLinkTitle"
"WebElementLinkURL"
"WebElementTargetFrame"
-"WebErrorDomainWebKit"
+"WebKitErrorDomain"
"WebFrameLoadTypeBack"
"WebFrameLoadTypeForward"
"WebFrameLoadTypeIndexedBackForward"
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 6f5de17..c8be035 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -129,7 +129,7 @@
[_private->resourceData appendData:data];
}
-- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(WebError *)result
+- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(NSError *)result
{
}
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index b786bbb..429079e 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -5,7 +5,7 @@
Public header file.
*/
-extern NSString *WebErrorDomainWebKit;
+extern NSString *WebKitErrorDomain;
/*!
@enum
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index f633337..2986c26 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -9,12 +9,12 @@
#import <WebKit/WebKitErrors.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <pthread.h>
-NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
+NSString *WebKitErrorDomain = @"WebKitErrorDomain";
// Download and file I/O errors
#define WebKitErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebKitErrorCannotCreateFile description")
@@ -35,26 +35,26 @@ NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
#define WebKitErrorDescriptionResourceLoadInterruptedByPolicyChange UI_STRING("Resource load interrupted", "WebKitErrorResourceLoadInterruptedByPolicyChange description")
// Plug-in and java errors
-#define WebKitErrorDescriptionWebErrorCannotFindPlugin UI_STRING("Cannot find plug-in", "WebKitErrorCannotFindPlugin description")
-#define WebKitErrorDescriptionWebErrorCannotLoadPlugin UI_STRING("Cannot load plug-in", "WebKitErrorCannotLoadPlugin description")
-#define WebKitErrorDescriptionWebErrorJavaUnavailable UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description")
+#define WebKitErrorDescriptionCannotFindPlugin UI_STRING("Cannot find plug-in", "WebKitErrorCannotFindPlugin description")
+#define WebKitErrorDescriptionCannotLoadPlugin UI_STRING("Cannot load plug-in", "WebKitErrorCannotLoadPlugin description")
+#define WebKitErrorDescriptionJavaUnavailable UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description")
static pthread_once_t registerErrorsControl = PTHREAD_ONCE_INIT;
static void registerErrors(void);
- at implementation WebError (WebExtras)
+ at implementation NSError (WebKitExtras)
+ (void)_registerWebKitErrors
{
pthread_once(®isterErrorsControl, registerErrors);
}
-+ (WebError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL
++ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL
{
[self _registerWebKitErrors];
- return [self errorWithCode:code inDomain:WebErrorDomainWebKit failingURL:URL];
+ return [self _web_errorWithDomain:WebKitErrorDomain code:code failingURL:URL];
}
@@ -83,12 +83,12 @@ static void registerErrors()
WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange, [NSNumber numberWithInt: WebKitErrorLocationChangeInterruptedByPolicyChange],
// Plug-in and java errors
- WebKitErrorDescriptionWebErrorCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
- WebKitErrorDescriptionWebErrorCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugin],
- WebKitErrorDescriptionWebErrorJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
+ WebKitErrorDescriptionCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
+ WebKitErrorDescriptionCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugin],
+ WebKitErrorDescriptionJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
nil];
- [WebError addErrorsWithCodesAndDescriptions:dict inDomain:WebErrorDomainWebKit];
+ [NSError _web_addErrorsWithCodesAndDescriptions:dict inDomain:WebKitErrorDomain];
[pool release];
}
diff --git a/WebKit/Misc.subproj/WebKitErrorsPrivate.h b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
index be25c31..35cdda1 100644
--- a/WebKit/Misc.subproj/WebKitErrorsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
@@ -7,9 +7,11 @@
#import <WebKit/WebKitErrors.h>
-#import <WebFoundation/WebError.h>
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
- at interface WebError (WebExtras)
-+ (WebError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL;
+ at interface NSError (WebKitExtras)
++ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL;
@end
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h
index 3e5cae5..66ec3cf 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h
@@ -7,15 +7,15 @@
#import <WebKit/WebBaseNetscapePluginStream.h>
+ at class NSError;
@class WebDataSource;
- at class WebError;
@protocol WebDocumentRepresentation;
@interface WebNetscapePluginRepresentation : WebBaseNetscapePluginStream <WebDocumentRepresentation>
{
unsigned _dataLengthReceived;
WebDataSource *_dataSource;
- WebError *_error;
+ NSError *_error;
}
- (void)redeliverStream;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index a4fbf45..f697b2f 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -10,7 +10,11 @@
#import <WebKit/WebNetscapePluginRepresentation.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSErrorExtras.h>
+
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
@implementation WebNetscapePluginRepresentation
@@ -55,7 +59,7 @@
[self receivedData:data];
}
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)ds
+- (void)receivedError:(NSError *)error withDataSource:(WebDataSource *)ds
{
[error retain];
[_error release];
@@ -65,7 +69,7 @@
return;
}
- if ([error errorCode] == WebFoundationErrorCancelled) {
+ if ([error code] == WebFoundationErrorCancelled) {
[self receivedError:NPRES_USER_BREAK];
} else {
[self receivedError:NPRES_NETWORK_ERR];
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 791945d..5bbd951 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -102,7 +102,7 @@
[super connectionDidFinishLoading:con];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)result
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)result
{
[[view controller] _receivedError:result fromDataSource:[view dataSource]];
diff --git a/WebKit/Plugins.subproj/WebPlugInError.h b/WebKit/Plugins.subproj/WebPlugInError.h
index 87d6e07..77bb447 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.h
+++ b/WebKit/Plugins.subproj/WebPlugInError.h
@@ -7,15 +7,17 @@
#import <Foundation/Foundation.h>
-#import <WebFoundation/WebError.h>
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
@class WebPlugInErrorPrivate;
/*!
@class WebPlugInError
- @discussion WebPlugInError is a subclass of WebError that is specific to plug-in related errors.
+ @discussion WebPlugInError is a subclass of NSError that is specific to plug-in related errors.
*/
- at interface WebPlugInError : WebError
+ at interface WebPlugInError : NSError
{
@private
WebPlugInErrorPrivate *_private;
diff --git a/WebKit/Plugins.subproj/WebPlugInError.m b/WebKit/Plugins.subproj/WebPlugInError.m
index 5fc63cd..704ec36 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.m
+++ b/WebKit/Plugins.subproj/WebPlugInError.m
@@ -9,6 +9,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebPlugInErrorPrivate.h>
+#import <WebFoundation/WebNSErrorExtras.h>
@interface WebPlugInErrorPrivate : NSObject
{
@@ -86,7 +87,7 @@
pluginName:(NSString *)pluginName
MIMEType:(NSString *)MIMEType;
{
- [super initWithErrorCode:code inDomain:WebErrorDomainWebKit failingURL:contentURL];
+ [super _web_initWithDomain:WebKitErrorDomain code:code failingURL:contentURL];
_private = [[WebPlugInErrorPrivate alloc] init];
_private->contentURL = [contentURL retain];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 7912d2c..2062705 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -41,7 +41,6 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index b725a8d..d9d0619 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -10,13 +10,16 @@
#import <WebKit/WebFrame.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-
#import <WebFoundation/NSURLResponse.h>
+#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebNSErrorExtras.h>
+
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
#import <WebCore/WebCoreResourceLoader.h>
@@ -62,8 +65,8 @@
[rLoader reportError];
- WebError *badURLError = [[WebError alloc] initWithErrorCode:WebFoundationErrorBadURL
- inDomain:WebErrorDomainWebFoundation
+ NSError *badURLError = [[NSError alloc] _web_initWithDomain:WebFoundationErrorDomain
+ code:WebFoundationErrorBadURL
failingURL:[URL absoluteString]];
[_controller _receivedError:badURLError fromDataSource:source];
[badURLError release];
@@ -73,7 +76,7 @@
return client;
}
-- (void)receivedError:(WebError *)error
+- (void)receivedError:(NSError *)error
{
[[dataSource _controller] _receivedError:error fromDataSource:dataSource];
}
@@ -120,7 +123,7 @@
[super connectionDidFinishLoading:con];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index b725a8d..d9d0619 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -10,13 +10,16 @@
#import <WebKit/WebFrame.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
-
#import <WebFoundation/NSURLResponse.h>
+#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebNSErrorExtras.h>
+
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
#import <WebCore/WebCoreResourceLoader.h>
@@ -62,8 +65,8 @@
[rLoader reportError];
- WebError *badURLError = [[WebError alloc] initWithErrorCode:WebFoundationErrorBadURL
- inDomain:WebErrorDomainWebFoundation
+ NSError *badURLError = [[NSError alloc] _web_initWithDomain:WebFoundationErrorDomain
+ code:WebFoundationErrorBadURL
failingURL:[URL absoluteString]];
[_controller _receivedError:badURLError fromDataSource:source];
[badURLError release];
@@ -73,7 +76,7 @@
return client;
}
-- (void)receivedError:(WebError *)error
+- (void)receivedError:(NSError *)error
{
[[dataSource _controller] _receivedError:error fromDataSource:dataSource];
}
@@ -120,7 +123,7 @@
[super connectionDidFinishLoading:con];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
{
// Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
[self retain];
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 7cc5339..f80e446 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -42,7 +42,7 @@ _WebElementLinkLabelKey
_WebElementLinkTargetFrameKey
_WebElementLinkTitleKey
_WebElementLinkURLKey
-_WebErrorDomainWebKit
+_WebKitErrorDomain
_WebHistoryAllItemsRemovedNotification
_WebHistoryItemsAddedNotification
_WebHistoryItemsKey
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index 4cbd74d..403d19d 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -7,9 +7,9 @@
#import <WebKit/WebViewPrivate.h>
+ at class NSError;
@class WebView;
@class WebDataSource;
- at class WebError;
@class NSURLConnection;
@class NSURLRequest;
@class NSURLResponse;
@@ -41,12 +41,12 @@
- downloadDelegate;
- (void)cancel;
-- (void)cancelWithError:(WebError *)error;
+- (void)cancelWithError:(NSError *)error;
- (void)setDefersCallbacks:(BOOL)defers;
- (BOOL)defersCallbacks;
-- (WebError *)cancelledError;
+- (NSError *)cancelledError;
- (void)setIdentifier: ident;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index faa6b2a..690d71f 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -5,15 +5,14 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
-
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
+#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -244,7 +243,7 @@
[self _releaseResources];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)result
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)result
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
@@ -258,7 +257,7 @@
[self _releaseResources];
}
-- (void)cancelWithError:(WebError *)error
+- (void)cancelWithError:(NSError *)error
{
ASSERT(!reachedTerminalState);
@@ -282,11 +281,11 @@
}
}
-- (WebError *)cancelledError
+- (NSError *)cancelledError
{
- return [WebError errorWithCode:WebFoundationErrorCancelled
- inDomain:WebErrorDomainWebFoundation
- failingURL:[[request URL] absoluteString]];
+ return [NSError _web_errorWithDomain:WebFoundationErrorDomain
+ code:WebFoundationErrorCancelled
+ failingURL:[[request URL] absoluteString]];
}
- (void)setIdentifier: ident
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 488e025..ed001ea 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -6,7 +6,7 @@
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebAssertions.h>
@@ -179,7 +179,7 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
resultCode = WebFoundationErrorResourceUnavailable;
- [client URLProtocol:self didFailWithError:[WebError errorWithCode:resultCode inDomain:WebErrorDomainWebFoundation failingURL:[[request URL] absoluteString]]];
+ [client URLProtocol:self didFailWithError:[NSError _web_errorWithDomain:WebFoundationErrorDomain code:resultCode failingURL:[[request URL] absoluteString]]];
}
}
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index b56436c..2eb028c 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -8,7 +8,6 @@
#import <Cocoa/Cocoa.h>
@class WebDataSourcePrivate;
- at class WebError;
@class WebFrame;
@class NSURLConnection;
@class NSURLRequest;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 7048251..81a1fb2 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -8,6 +8,7 @@
#import <WebKit/WebDataSource.h>
+ at class NSError;
@class WebBridge;
@class WebHistoryItem;
@class WebIconLoader;
@@ -69,7 +70,7 @@
NSMutableDictionary *errors;
// Error associated with main document.
- WebError *mainDocumentError;
+ NSError *mainDocumentError;
BOOL loading; // self and controller are retained while loading
@@ -114,7 +115,7 @@
@interface WebDataSource (WebPrivate)
-- (WebError *)_mainDocumentError;
+- (NSError *)_mainDocumentError;
- (NSString *)_stringWithData:(NSData *)data;
- (void)_startLoading;
- (void)_stopLoading;
@@ -138,7 +139,7 @@
- (void)_setResponse:(NSURLResponse *)response;
- (void)_layoutChildren;
- (void)_clearErrors;
-- (void)_setMainDocumentError:(WebError *)error;
+- (void)_setMainDocumentError:(NSError *)error;
+ (NSMutableDictionary *)_repTypes;
+ (Class)_representationClassForMIMEType:(NSString *)MIMEType;
- (void)_loadIcon;
@@ -161,7 +162,7 @@
- (void)_makeRepresentation;
- (void)_receivedData:(NSData *)data;
- (void)_finishedLoading;
-- (void)_receivedError:(WebError *)error complete:(BOOL)isComplete;
+- (void)_receivedError:(NSError *)error complete:(BOOL)isComplete;
- (void)_defersCallbacksChanged;
- (NSURLRequest *)_originalRequest;
- (NSDictionary *)_triggeringAction;
@@ -177,7 +178,7 @@
- (void)_addResponse: (NSURLResponse *)r;
- (NSArray *)_responses;
-- (void)_stopLoadingWithError:(WebError *)error;
+- (void)_stopLoadingWithError:(NSError *)error;
- (void)_setWebFrame:(WebFrame *)frame;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 84ca9e5..df8ae15 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -30,8 +30,8 @@
#import <WebKit/WebTextRepresentation.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/NSURLConnection.h>
@@ -238,9 +238,9 @@
[_private->mainClient cancel];
}else{
// Main handle is already done. Set the cancelled error.
- WebError *cancelledError = [WebError errorWithCode:WebFoundationErrorCancelled
- inDomain:WebErrorDomainWebFoundation
- failingURL:[[self _URL] absoluteString]];
+ NSError *cancelledError = [NSError _web_errorWithDomain:WebFoundationErrorDomain
+ code:WebFoundationErrorCancelled
+ failingURL:[[self _URL] absoluteString]];
[self _setMainDocumentError:cancelledError];
}
@@ -404,7 +404,7 @@
return _private->ourBackForwardItems;
}
-- (void)_setMainDocumentError: (WebError *)error
+- (void)_setMainDocumentError: (NSError *)error
{
[error retain];
[_private->mainDocumentError release];
@@ -576,7 +576,7 @@
[[self representation] finishedLoadingWithDataSource:self];
}
-- (void)_receivedError:(WebError *)error complete:(BOOL)isComplete
+- (void)_receivedError:(NSError *)error complete:(BOOL)isComplete
{
if (!_private->committed) {
[[[self webFrame] _bridge] didNotOpenURL:[[_private->originalRequestCopy URL] absoluteString]];
@@ -736,7 +736,7 @@
return _private->responses;
}
-- (void)_stopLoadingWithError:(WebError *)error
+- (void)_stopLoadingWithError:(NSError *)error
{
[_private->mainClient cancelWithError:error];
}
@@ -769,7 +769,7 @@
}
}
-- (WebError *)_mainDocumentError
+- (NSError *)_mainDocumentError
{
return _private->mainDocumentError;
}
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
index 7b37b65..226baab 100644
--- a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
@@ -2,12 +2,14 @@
WebLocationChangeDelegate.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebFoundation/WebError.h>
-
#import <WebKit/WebDefaultLocationChangeDelegate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
+
@implementation WebDefaultLocationChangeDelegate
static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
@@ -31,7 +33,7 @@ static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
- (void)webView: (WebView *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
- (void)webView: (WebView *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)webView: (WebView *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource { }
- (void)webView: (WebView *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
diff --git a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
index 7b37b65..226baab 100644
--- a/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultLocationChangeDelegate.m
@@ -2,12 +2,14 @@
WebLocationChangeDelegate.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebFoundation/WebError.h>
-
#import <WebKit/WebDefaultLocationChangeDelegate.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
+
@implementation WebDefaultLocationChangeDelegate
static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
@@ -31,7 +33,7 @@ static WebDefaultLocationChangeDelegate *sharedDelegate = nil;
- (void)webView: (WebView *)wv receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
- (void)webView: (WebView *)wv receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)webView: (WebView *)wv locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+- (void)webView: (WebView *)wv locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource { }
- (void)webView: (WebView *)wv willCloseLocationForDataSource:(WebDataSource *)dataSource { }
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 043f604..d07612e 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -28,7 +28,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- (void)webView: (WebView *)wv unableToImplementPolicyWithError:(WebError *)error frame:(WebFrame *)frame
+- (void)webView: (WebView *)wv unableToImplementPolicyWithError:(NSError *)error frame:(WebFrame *)frame
{
ERROR("called unableToImplementPolicyWithError:%@ inFrame:%@", error, frame);
}
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index a2a9f93..36e8eef 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -3,10 +3,10 @@
Copyright 2003, Apple, Inc. All rights reserved.
*/
-#import <WebFoundation/WebError.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLResponse.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
@@ -50,7 +50,7 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
{
}
--(void)webView: (WebView *)wv resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
+-(void)webView: (WebView *)wv resource:identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 050448a..c485068 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -5,8 +5,8 @@
#import <Cocoa/Cocoa.h>
+ at class NSError;
@class WebDataSource;
- at class WebError;
/*!
@protocol WebDocumentView
@@ -154,7 +154,7 @@
@param error The error that the data source has received.
@param dataSource The data source that has received the error.
*/
-- (void)receivedError: (WebError *)error withDataSource: (WebDataSource *)dataSource;
+- (void)receivedError: (NSError *)error withDataSource: (WebDataSource *)dataSource;
/*!
@method finishedLoadingWithDataSource:
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index eab12d2..9a5a5e9 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -10,7 +10,6 @@
@class WebView;
@class WebDataSource;
- at class WebError;
@class WebFramePrivate;
@class WebFrameView;
@class NSURLRequest;
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 3e7c076..6a3e2b3 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
+ at class NSError;
@class WebView;
@class WebDataSource;
- at class WebError;
@class WebFrame;
/*!
@@ -83,7 +83,7 @@
@discussion This callback will only be received when all
subresources are done loading.
*/
-- (void)webView:(WebView *)sender locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource;
/*!
@method willCloseLocationForDataSource:
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 45c29d7..bc0e9c0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -29,7 +29,7 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/NSURLConnection.h>
@@ -1039,8 +1039,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_handleUnimplementablePolicyWithErrorCode:(int)code forURL:(NSURL *)URL
{
- WebError *error = [WebError _webKitErrorWithCode:code
- failingURL:[URL absoluteString]];
+ NSError *error = [NSError _webKitErrorWithCode:code failingURL:[URL absoluteString]];
WebView *c = [self webView];
[[c _policyDelegateForwarder] webView:c unableToImplementPolicyWithError:error frame:self];
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 298a18b..27919a0 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -25,7 +25,6 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/NSURLRequest.h>
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 03ad99f..abc2e23 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -63,7 +63,7 @@
[_private->bridge receivedData:data withDataSource:dataSource];
}
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
+- (void)receivedError:(NSError *)error withDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index 2e10269..f98d5cb 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -12,6 +12,10 @@
#import <WebFoundation/NSURLRequest.h>
+#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+#import <WebFoundation/NSError.h>
+#endif
+
@implementation WebImageRepresentation
- init
@@ -51,7 +55,7 @@
//[image incrementalLoadWithBytes:[data bytes] length:[data length] complete:isComplete];
}
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
+- (void)receivedError:(NSError *)error withDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index 4cbd74d..403d19d 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -7,9 +7,9 @@
#import <WebKit/WebViewPrivate.h>
+ at class NSError;
@class WebView;
@class WebDataSource;
- at class WebError;
@class NSURLConnection;
@class NSURLRequest;
@class NSURLResponse;
@@ -41,12 +41,12 @@
- downloadDelegate;
- (void)cancel;
-- (void)cancelWithError:(WebError *)error;
+- (void)cancelWithError:(NSError *)error;
- (void)setDefersCallbacks:(BOOL)defers;
- (BOOL)defersCallbacks;
-- (WebError *)cancelledError;
+- (NSError *)cancelledError;
- (void)setIdentifier: ident;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index faa6b2a..690d71f 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -5,15 +5,14 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
-
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
+#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -244,7 +243,7 @@
[self _releaseResources];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)result
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)result
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
@@ -258,7 +257,7 @@
[self _releaseResources];
}
-- (void)cancelWithError:(WebError *)error
+- (void)cancelWithError:(NSError *)error
{
ASSERT(!reachedTerminalState);
@@ -282,11 +281,11 @@
}
}
-- (WebError *)cancelledError
+- (NSError *)cancelledError
{
- return [WebError errorWithCode:WebFoundationErrorCancelled
- inDomain:WebErrorDomainWebFoundation
- failingURL:[[request URL] absoluteString]];
+ return [NSError _web_errorWithDomain:WebFoundationErrorDomain
+ code:WebFoundationErrorCancelled
+ failingURL:[[request URL] absoluteString]];
}
- (void)setIdentifier: ident
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 3e7c076..6a3e2b3 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
+ at class NSError;
@class WebView;
@class WebDataSource;
- at class WebError;
@class WebFrame;
/*!
@@ -83,7 +83,7 @@
@discussion This callback will only be received when all
subresources are done loading.
*/
-- (void)webView:(WebView *)sender locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender locationChangeDone:(NSError *)error forDataSource:(WebDataSource *)dataSource;
/*!
@method willCloseLocationForDataSource:
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 64f74e0..863768a 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -6,7 +6,7 @@
#import <WebKit/WebMainResourceClient.h>
#import <WebFoundation/WebCookieConstants.h>
-#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -58,7 +58,7 @@
[super dealloc];
}
-- (void)receivedError:(WebError *)error
+- (void)receivedError:(NSError *)error
{
// Calling _receivedError will likely result in a call to release, so we must retain.
[self retain];
@@ -76,17 +76,17 @@
policyResponse = nil;
}
--(void)cancelWithError:(WebError *)error
+-(void)cancelWithError:(NSError *)error
{
[self cancelContentPolicy];
[connection cancel];
[self receivedError:error];
}
-- (WebError *)interruptForPolicyChangeError
+- (NSError *)interruptForPolicyChangeError
{
- return [WebError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
- failingURL:[[request URL] absoluteString]];
+ return [NSError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
+ failingURL:[[request URL] absoluteString]];
}
-(void)stopLoadingForPolicyChange
@@ -276,13 +276,13 @@
[self release];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
{
ASSERT(![con defersCallbacks]);
ASSERT(![self defersCallbacks]);
ASSERT(![[dataSource _controller] defersCallbacks]);
- LOG(Loading, "URL = %@, error = %@", [error failingURL], [error errorDescription]);
+ LOG(Loading, "URL = %@, error = %@", [error _web_failingURL], [error _web_localizedDescription]);
[self receivedError:error];
}
@@ -357,7 +357,7 @@
[delegate connectionDidFinishLoading:connection];
}
-- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(NSError *)error
{
ASSERT(delegate);
[delegate connection:connection didFailLoadingWithError:error];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 64f74e0..863768a 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -6,7 +6,7 @@
#import <WebKit/WebMainResourceClient.h>
#import <WebFoundation/WebCookieConstants.h>
-#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -58,7 +58,7 @@
[super dealloc];
}
-- (void)receivedError:(WebError *)error
+- (void)receivedError:(NSError *)error
{
// Calling _receivedError will likely result in a call to release, so we must retain.
[self retain];
@@ -76,17 +76,17 @@
policyResponse = nil;
}
--(void)cancelWithError:(WebError *)error
+-(void)cancelWithError:(NSError *)error
{
[self cancelContentPolicy];
[connection cancel];
[self receivedError:error];
}
-- (WebError *)interruptForPolicyChangeError
+- (NSError *)interruptForPolicyChangeError
{
- return [WebError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
- failingURL:[[request URL] absoluteString]];
+ return [NSError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
+ failingURL:[[request URL] absoluteString]];
}
-(void)stopLoadingForPolicyChange
@@ -276,13 +276,13 @@
[self release];
}
-- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)con didFailLoadingWithError:(NSError *)error
{
ASSERT(![con defersCallbacks]);
ASSERT(![self defersCallbacks]);
ASSERT(![[dataSource _controller] defersCallbacks]);
- LOG(Loading, "URL = %@, error = %@", [error failingURL], [error errorDescription]);
+ LOG(Loading, "URL = %@, error = %@", [error _web_failingURL], [error _web_localizedDescription]);
[self receivedError:error];
}
@@ -357,7 +357,7 @@
[delegate connectionDidFinishLoading:connection];
}
-- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(WebError *)error
+- (void)connection:(NSURLConnection *)connection didFailLoadingWithError:(NSError *)error
{
ASSERT(delegate);
[delegate connection:connection didFailLoadingWithError:error];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 8cb5eae..1cd709f 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -7,12 +7,12 @@
#import <Cocoa/Cocoa.h>
+ at class NSError;
+ at class NSURLResponse;
+ at class NSURLRequest;
@class WebView;
- at class WebError;
@class WebFrame;
@class WebPolicyPrivate;
- at class NSURLResponse;
- at class NSURLRequest;
/*!
@@ -174,6 +174,6 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param URL The URL of the resource for which a particular action was requested but failed.
@param frame The frame in which the policy could not be implemented.
*/
-- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(WebError *)error frame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(NSError *)error frame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 2e81ff5..db081c4 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -99,7 +99,7 @@
@param error The error associated with this load.
@param dataSource The dataSource that initiated the load.
*/
--(void)webView:(WebView *)sender resource:identifier didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
+-(void)webView:(WebView *)sender resource:identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource;
/*!
@method pluginFailedWithError:dataSource:
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index f045bbc..f896572 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -45,7 +45,7 @@
}
}
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
+- (void)receivedError:(NSError *)error withDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 77fbf54..d780f31 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -12,7 +12,6 @@
@class WebViewPrivate;
@class WebDataSource;
@class WebDownload;
- at class WebError;
@class WebFrame;
@class NSURLConnection;
@class WebPreferences;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 0b278eb..c3f33c5 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -6,8 +6,8 @@
#import <WebKit/WebView.h>
#import <WebKit/WebFramePrivate.h>
+ at class NSError;
@class WebBackForwardList;
- at class WebError;
@class WebFrame;
@class WebPreferences;
@class WebCoreSettings;
@@ -114,9 +114,9 @@ typedef struct _WebResourceDelegateImplementationCache {
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
- (void)_finishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
-- (void)_receivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
+- (void)_receivedError:(NSError *)error fromDataSource:(WebDataSource *)dataSource;
- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_mainReceivedError:(NSError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
+ (NSString *)_MIMETypeForFile:(NSString *)path;
- (void)_downloadURL:(NSURL *)URL;
- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directoryPath;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index daa0a00..c89697f 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -27,7 +27,6 @@
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
@@ -176,7 +175,7 @@
}
-- (void)_receivedError: (WebError *)error fromDataSource: (WebDataSource *)dataSource
+- (void)_receivedError: (NSError *)error fromDataSource: (WebDataSource *)dataSource
{
WebFrame *frame = [dataSource webFrame];
@@ -184,7 +183,7 @@
}
-- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
+- (void)_mainReceivedError:(NSError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
{
ASSERT(dataSource);
#ifndef NDEBUG
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list