[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:30:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 20e3b579bb5a04d40b44b42e1ab3dd04a0d1c8f6
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 18 00:44:14 2003 +0000
WebKit:
Fixed: 3200647 - File I/O related download errors just says "error"
Reviewed by darin.
* Downloads.subproj/WebDownload.m:
(+[WebDownloadPrivate initialize]): call _registerWebKitErrors
* English.lproj/Localizable.strings:
* Misc.subproj/WebKitErrors.h: cleaned-up, removed unused errors
* Misc.subproj/WebKitErrors.m:
(+[WebError _registerWebKitErrors]):
(registerErrors):
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebView.m:
(+[WebFrameView initialize]): call _registerWebKitErrors
WebBrowser:
Fixed: 3200647 - File I/O related download errors just says "error"
Reviewed by darin.
* DownloadProgressEntry.h:
* DownloadProgressEntry.m:
(-[DownloadProgressEntry dictionaryRepresentation]): store the error domain
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2889d04..fd0811c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-03-17 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3200647 - File I/O related download errors just says "error"
+
+ Reviewed by darin.
+
+ * Downloads.subproj/WebDownload.m:
+ (+[WebDownloadPrivate initialize]): call _registerWebKitErrors
+ * English.lproj/Localizable.strings:
+ * Misc.subproj/WebKitErrors.h: cleaned-up, removed unused errors
+ * Misc.subproj/WebKitErrors.m:
+ (+[WebError _registerWebKitErrors]):
+ (registerErrors):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebView.m:
+ (+[WebFrameView initialize]): call _registerWebKitErrors
+
2003-03-17 Darin Adler <darin at apple.com>
Reviewed by Chris and Richard.
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index bba67c5..bbd87cc 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -11,7 +11,7 @@
#import <WebKit/WebBinHexDecoder.h>
#import <WebKit/WebDownloadDecoder.h>
#import <WebKit/WebGZipDecoder.h>
-#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebMacBinaryDecoder.h>
#import <WebKit/WebMainResourceClient.h>
@@ -122,19 +122,15 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
@implementation WebDownloadPrivate
-- init
++ (void)initialize
{
- [super init];
-
- if (!decoderClasses) {
- decoderClasses = [[NSArray arrayWithObjects:
- [WebBinHexDecoder class],
- [WebMacBinaryDecoder class],
- [WebGZipDecoder class],
- nil] retain];
- }
+ [WebError _registerWebKitErrors];
- return self;
+ decoderClasses = [[NSArray arrayWithObjects:
+ [WebBinHexDecoder class],
+ [WebMacBinaryDecoder class],
+ [WebGZipDecoder class],
+ nil] retain];
}
- (void)dealloc
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 4ce53ce..d1f0168 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index 7357438..f91338c 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -9,44 +9,49 @@ extern NSString *WebErrorDomainWebKit;
/*!
@enum
+ @description Download and file I/O errors
@constant WebKitErrorCannotCreateFile
@constant WebKitErrorCannotOpenFile
@constant WebKitErrorCannotCloseFile
@constant WebKitErrorCannotWriteToFile
@constant WebKitErrorCannotRemoveFile
@constant WebKitErrorCannotMoveFile
- @constant WebKitErrorCannotFindApplicationForFile
- @constant WebKitErrorCannotFindApplicationForURL
- @constant WebKitErrorFinderCannotOpenDirectory
- @constant WebKitErrorCannotShowDirectory
+*/
+enum {
+ WebKitErrorCannotCreateFile = 0,
+ WebKitErrorCannotOpenFile = 1,
+ WebKitErrorCannotCloseFile = 2,
+ WebKitErrorCannotWriteToFile = 3,
+ WebKitErrorCannotRemoveFile = 4,
+ WebKitErrorCannotMoveFile = 5,
+ WebKitErrorDownloadDecodingFailedMidStream = 6,
+ WebKitErrorDownloadDecodingFailedToComplete = 7,
+};
+
+/*!
+ @enum
+ @description Policy errors
@constant WebKitErrorCannotShowMIMEType
@constant WebKitErrorCannotShowURL
@constant WebKitErrorLocationChangeInterruptedByPolicyChange
@constant WebKitErrorResourceLoadInterruptedByPolicyChange
+*/
+enum {
+ WebKitErrorCannotShowMIMEType = 100,
+ WebKitErrorCannotShowURL = 101,
+ WebKitErrorLocationChangeInterruptedByPolicyChange = 102,
+ WebKitErrorResourceLoadInterruptedByPolicyChange = 103,
+};
+
+/*!
+ @enum
+ @description Plug-in and java errors
@constant WebKitErrorCannotFindPlugin
@constant WebKitErrorCannotLoadPlugin
@constant WebKitErrorJavaUnavailable
- @constant WebKitErrorDownloadDecodingFailedMidStream
- @constant WebKitErrorDownloadDecodingFailedToComplete
*/
enum {
- WebKitErrorCannotCreateFile,
- WebKitErrorCannotOpenFile,
- WebKitErrorCannotCloseFile,
- WebKitErrorCannotWriteToFile,
- WebKitErrorCannotRemoveFile,
- WebKitErrorCannotMoveFile,
- WebKitErrorCannotFindApplicationForFile,
- WebKitErrorCannotFindApplicationForURL,
- WebKitErrorFinderCannotOpenDirectory,
- WebKitErrorCannotShowDirectory,
- WebKitErrorCannotShowMIMEType,
- WebKitErrorCannotShowURL,
- WebKitErrorLocationChangeInterruptedByPolicyChange,
- WebKitErrorResourceLoadInterruptedByPolicyChange,
- WebKitErrorCannotFindPlugin,
- WebKitErrorCannotLoadPlugin,
- WebKitErrorJavaUnavailable,
- WebKitErrorDownloadDecodingFailedMidStream,
- WebKitErrorDownloadDecodingFailedToComplete,
+ WebKitErrorCannotFindPlugin = 200,
+ WebKitErrorCannotLoadPlugin = 201,
+ WebKitErrorJavaUnavailable = 202,
};
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index c20b99e..b5745cf 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -16,63 +16,67 @@
NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
-#define WebErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebKitErrorCannotCreateFile description")
-#define WebErrorDescriptionCannotOpenFile UI_STRING("Cannot open file", "WebKitErrorCannotOpenFile description")
-#define WebErrorDescriptionCannotCloseFile UI_STRING("Failure occurred while closing file", "WebKitErrorCannotCloseFile description")
-#define WebErrorDescriptionCannotWriteToFile UI_STRING("Cannot write file", "WebKitErrorCannotWriteToFile description")
-#define WebErrorDescriptionCannotRemoveFile UI_STRING("Cannot remove file", "WebKitErrorCannotRemoveFile description")
-#define WebErrorDescriptionCannotMoveFile UI_STRING("Cannot move file", "WebKitErrorCannotMoveFile description")
-#define WebErrorDescriptionCannotFindApplicationForFile UI_STRING("Cannot find application for file", "WebKitErrorCannotFindApplicationForFile description")
-#define WebErrorDescriptionCannotFindApplicationForURL UI_STRING("Cannot find application for URL", "WebKitErrorCannotFindApplicationForURL description")
-#define WebErrorDescriptionFinderCannotOpenDirectory UI_STRING("Finder cannot open directory", "WebKitErrorFinderCannotOpenDirectory description")
-#define WebErrorDescriptionCannotShowDirectory UI_STRING("Cannot show a file directory", "WebKitErrorCannotShowDirectory description")
-#define WebErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebKitErrorCannotShowMIMEType description")
-#define WebErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebKitErrorCannotShowURL description")
-#define WebErrorDescriptionWebErrorCannotFindPlugin UI_STRING("Cannot find plug-in", "WebKitErrorCannotFindPlugin description")
-#define WebErrorDescriptionWebErrorCannotLoadPlugin UI_STRING("Cannot load plug-in", "WebKitErrorCannotLoadPlugin description")
-#define WebErrorDescriptionWebErrorJavaUnavailable UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description")
-#define WebErrorDescriptionDownloadDecodingFailedToComplete UI_STRING_KEY("Download decoding failed", "Download decoding failed (at end)", "WebKitErrorDownloadDecodingFailedToComplete description")
-#define WebErrorDescriptionDownloadDecodingFailedMidStream UI_STRING_KEY("Download decoding failed", "Download decoding failed (midstream)", "WebKitErrorDownloadDecodingFailedMidStream description")
-
-static pthread_once_t categoryInitializeControl = PTHREAD_ONCE_INIT;
-static void categoryInitialize(void);
-
- at interface WebError (WebExtras)
- at end
+// Download and file I/O errors
+#define WebKitErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebKitErrorCannotCreateFile description")
+#define WebKitErrorDescriptionCannotOpenFile UI_STRING("Cannot open file", "WebKitErrorCannotOpenFile description")
+#define WebKitErrorDescriptionCannotCloseFile UI_STRING("Failure occurred while closing file", "WebKitErrorCannotCloseFile description")
+#define WebKitErrorDescriptionCannotWriteToFile UI_STRING("Cannot write file", "WebKitErrorCannotWriteToFile description")
+#define WebKitErrorDescriptionCannotRemoveFile UI_STRING("Cannot remove file", "WebKitErrorCannotRemoveFile description")
+#define WebKitErrorDescriptionCannotMoveFile UI_STRING("Cannot move file", "WebKitErrorCannotMoveFile description")
+#define WebKitErrorDescriptionDownloadDecodingFailedToComplete UI_STRING_KEY("Download decoding failed", "Download decoding failed (at end)", "WebKitErrorDownloadDecodingFailedToComplete description")
+#define WebKitErrorDescriptionDownloadDecodingFailedMidStream UI_STRING_KEY("Download decoding failed", "Download decoding failed (midstream)", "WebKitErrorDownloadDecodingFailedMidStream description")
+
+// Policy errors
+#define WebKitErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebKitErrorCannotShowMIMEType description")
+#define WebKitErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebKitErrorCannotShowURL description")
+#define WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange UI_STRING("Location change interrupted", "WebKitErrorLocationChangeInterruptedByPolicyChange description")
+#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")
+
+
+static pthread_once_t registerErrorsControl = PTHREAD_ONCE_INIT;
+static void registerErrors(void);
@implementation WebError (WebExtras)
-+ (void)initialize
++ (void)_registerWebKitErrors
{
- pthread_once(&categoryInitializeControl, categoryInitialize);
+ pthread_once(®isterErrorsControl, registerErrors);
}
@end
-static void categoryInitialize()
+static void registerErrors()
{
NSAutoreleasePool *pool;
pool = [[NSAutoreleasePool alloc] init];
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
- WebErrorDescriptionCannotCreateFile, [NSNumber numberWithInt: WebKitErrorCannotCreateFile],
- WebErrorDescriptionCannotOpenFile, [NSNumber numberWithInt: WebKitErrorCannotOpenFile],
- WebErrorDescriptionCannotCloseFile, [NSNumber numberWithInt: WebKitErrorCannotCloseFile],
- WebErrorDescriptionCannotWriteToFile, [NSNumber numberWithInt: WebKitErrorCannotWriteToFile],
- WebErrorDescriptionCannotRemoveFile, [NSNumber numberWithInt: WebKitErrorCannotRemoveFile],
- WebErrorDescriptionCannotMoveFile, [NSNumber numberWithInt: WebKitErrorCannotMoveFile],
- WebErrorDescriptionCannotFindApplicationForFile, [NSNumber numberWithInt: WebKitErrorCannotFindApplicationForFile],
- WebErrorDescriptionCannotFindApplicationForURL, [NSNumber numberWithInt: WebKitErrorCannotFindApplicationForURL],
- WebErrorDescriptionFinderCannotOpenDirectory, [NSNumber numberWithInt: WebKitErrorFinderCannotOpenDirectory],
- WebErrorDescriptionCannotShowDirectory, [NSNumber numberWithInt: WebKitErrorCannotShowDirectory],
- WebErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
- WebErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebKitErrorCannotShowURL],
- WebErrorDescriptionWebErrorCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
- WebErrorDescriptionWebErrorCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugin],
- WebErrorDescriptionWebErrorJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
- WebErrorDescriptionDownloadDecodingFailedToComplete, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedToComplete],
- WebErrorDescriptionDownloadDecodingFailedMidStream, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedMidStream],
+ // Download and file I/O errors
+ WebKitErrorDescriptionCannotCreateFile, [NSNumber numberWithInt: WebKitErrorCannotCreateFile],
+ WebKitErrorDescriptionCannotOpenFile, [NSNumber numberWithInt: WebKitErrorCannotOpenFile],
+ WebKitErrorDescriptionCannotCloseFile, [NSNumber numberWithInt: WebKitErrorCannotCloseFile],
+ WebKitErrorDescriptionCannotWriteToFile, [NSNumber numberWithInt: WebKitErrorCannotWriteToFile],
+ WebKitErrorDescriptionCannotRemoveFile, [NSNumber numberWithInt: WebKitErrorCannotRemoveFile],
+ WebKitErrorDescriptionCannotMoveFile, [NSNumber numberWithInt: WebKitErrorCannotMoveFile],
+ WebKitErrorDescriptionDownloadDecodingFailedToComplete, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedToComplete],
+ WebKitErrorDescriptionDownloadDecodingFailedMidStream, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedMidStream],
+
+ // Policy errors
+ WebKitErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
+ WebKitErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebKitErrorCannotShowURL],
+ WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange, [NSNumber numberWithInt: WebKitErrorLocationChangeInterruptedByPolicyChange],
+ WebKitErrorDescriptionResourceLoadInterruptedByPolicyChange, [NSNumber numberWithInt: WebKitErrorResourceLoadInterruptedByPolicyChange],
+
+ // Plug-in and java errors
+ WebKitErrorDescriptionWebErrorCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
+ WebKitErrorDescriptionWebErrorCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugin],
+ WebKitErrorDescriptionWebErrorJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
nil];
[WebError addErrorsWithCodesAndDescriptions:dict inDomain:WebErrorDomainWebKit];
diff --git a/WebKit/Misc.subproj/WebKitErrorsPrivate.h b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
new file mode 100644
index 0000000..1459b85
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
@@ -0,0 +1,15 @@
+/*
+ WebKitErrorsPrivate.h
+ Copyright 2003, Apple, Inc. All rights reserved.
+
+ Private header file.
+*/
+
+#import <WebKit/WebKitErrors.h>
+
+#import <WebFoundation/WebError.h>
+
+ at interface WebError (WebExtras)
++ (void)_registerWebKitErrors;
+ at end
+
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c10172d..a7f37cf 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -306,6 +306,7 @@
700BC50D04144DA100A80182,
70BC9ED904144FC500A80182,
70BC9EDC0414514E00A80182,
+ 84CA5F7F042685E800CA2ACA,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -500,6 +501,7 @@
2568C72C0174912D0ECA149E,
F5927D4E02D26C5E01CA2DBB,
83730F9803FB1E660004736E,
+ 84CA5F7E042685E800CA2ACA,
9367C636034E9F00008635C5,
7082F56F038EADAA00A80180,
7082F570038EADAA00A80180,
@@ -2098,6 +2100,18 @@
settings = {
};
};
+ 84CA5F7E042685E800CA2ACA = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebKitErrorsPrivate.h;
+ refType = 4;
+ };
+ 84CA5F7F042685E800CA2ACA = {
+ fileRef = 84CA5F7E042685E800CA2ACA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
84D4BFF70348EF7600CA2ACA = {
fileEncoding = 4;
isa = PBXFileReference;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 347335b..0355bd9 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -15,7 +15,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRendererFactory.h>
#import <WebKit/WebImageView.h>
-#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
@@ -36,6 +36,11 @@ enum {
@implementation WebFrameView
++ (void)initialize
+{
+ [WebError _registerWebKitErrors];
+}
+
- initWithFrame: (NSRect) frame
{
[super initWithFrame: frame];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list