[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:24:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 91dad3e76be8aaadbde458fc6328f28244e721c3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 13 01:29:03 2003 +0000
- Moved the WebKit error registration out of WebView because apps that use WebKit but not WebView might need to use WebKit errors (like my test app for WebDownload).
- Added file close and file move errors (needed for WebDownload).
Reviewed by kocienda.
* English.lproj/Localizable.strings: Localize file close and file move errors.
* Misc.subproj/WebKitErrors.h: Added file close and file move errors.
* Misc.subproj/WebKitErrors.m: Added.
(+[WebError initialize]): register the errors here
* WebKit.exp: Export the WebDownload class (forgot to do this earlier).
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebView.m: don't register the errors here
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3643 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f93858f..734ea94 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-02-12 Chris Blumenberg <cblu at apple.com>
+
+ - Moved the WebKit error registration out of WebView because apps that use WebKit but not WebView might need to use WebKit errors (like my test app for WebDownload).
+ - Added file close and file move errors (needed for WebDownload).
+
+ Reviewed by kocienda.
+
+ * English.lproj/Localizable.strings: Localize file close and file move errors.
+ * Misc.subproj/WebKitErrors.h: Added file close and file move errors.
+ * Misc.subproj/WebKitErrors.m: Added.
+ (+[WebError initialize]): register the errors here
+ * WebKit.exp: Export the WebDownload class (forgot to do this earlier).
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebView.m: don't register the errors here
+
2003-02-12 Darin Adler <darin at apple.com>
Reviewed by Ken.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 0558b90..be5c89b 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 8f8c522..04a99df 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -5,17 +5,16 @@
Public header file.
*/
-// WebFoundation error codes < 10000
-// WebKit error codes >= 10000
-
extern NSString *WebErrorDomainWebKit;
/*!
@enum
@constant WebKitErrorCannotCreateFile
@constant WebKitErrorCannotOpenFile
+ @constant WebKitErrorCannotCloseFile
@constant WebKitErrorCannotWriteToFile
@constant WebKitErrorCannotRemoveFile
+ @constant WebKitErrorCannotMoveFile
@constant WebKitErrorCannotFindApplicationForFile
@constant WebKitErrorFinderCannotOpenDirectory
@constant WebKitErrorCannotShowDirectory
@@ -29,8 +28,10 @@ extern NSString *WebErrorDomainWebKit;
enum {
WebKitErrorCannotCreateFile,
WebKitErrorCannotOpenFile,
+ WebKitErrorCannotCloseFile,
WebKitErrorCannotWriteToFile,
WebKitErrorCannotRemoveFile,
+ WebKitErrorCannotMoveFile,
WebKitErrorCannotFindApplicationForFile,
WebKitErrorFinderCannotOpenDirectory,
WebKitErrorCannotShowDirectory,
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
new file mode 100644
index 0000000..367238a
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -0,0 +1,81 @@
+/*
+ * WebKitErrors.m
+ * WebKit
+ *
+ * Created by Chris Blumenberg on Wed Feb 12 2003.
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#import <WebKit/WebKitErrors.h>
+
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebLocalizableStrings.h>
+
+#import <pthread.h>
+
+NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
+
+#define WebErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebErrorCannotCreateFile description")
+#define WebErrorDescriptionCannotOpenFile UI_STRING("Cannot open file", "WebErrorCannotOpenFile description")
+#define WebErrorDescriptionCannotCloseFile UI_STRING("Failure occurred while closing file", "WebKitErrorCannotCloseFile description")
+#define WebErrorDescriptionCannotWriteToFile UI_STRING("Cannot write file", "WebErrorCannotWriteToFile description")
+#define WebErrorDescriptionCannotRemoveFile UI_STRING("Cannot remove file", "WebErrorCannotRemoveFile description")
+#define WebErrorDescriptionCannotMoveFile UI_STRING("Cannot move file", "WebKitErrorCannotMoveFile description")
+#define WebErrorDescriptionCannotFindApplicationForFile UI_STRING("Cannot find application for file", "WebErrorCannotFindApplicationForFile description")
+#define WebErrorDescriptionFinderCannotOpenDirectory UI_STRING("Finder cannot open directory", "WebErrorFinderCannotOpenDirectory description")
+#define WebErrorDescriptionCannotShowDirectory UI_STRING("Cannot show a file directory", "WebErrorCannotShowDirectory description")
+#define WebErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebErrorCannotShowMIMEType description")
+#define WebErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebErrorCannotShowURL description")
+#define WebErrorDescriptionCannotFindApplicationForURL UI_STRING("Cannot find application for URL", "WebErrorCannotNotFindApplicationForURL description")
+#define WebErrorDescriptionWebErrorCannotFindPlugin UI_STRING("Cannot find plug-in", "WebErrorCannotFindPlugin description")
+#define WebErrorDescriptionWebErrorCannotLoadPlugin UI_STRING("Cannot load plug-in", "WebErrorCannotLoadPlugin description")
+#define WebErrorDescriptionWebErrorJavaUnavailable UI_STRING("Java is unavailable", "WebErrorJavaUnavailable description")
+#define WebErrorDescriptionDownloadDecodingFailedToComplete UI_STRING_KEY("Download decoding failed", "Download decoding failed (at end)", "WebErrorDownloadDecodingFailedToComplete description")
+#define WebErrorDescriptionDownloadDecodingFailedMidStream UI_STRING_KEY("Download decoding failed", "Download decoding failed (midstream)", "WebErrorDownloadDecodingFailedMidStream description")
+
+static pthread_once_t categoryInitializeControl = PTHREAD_ONCE_INIT;
+static void categoryInitialize(void);
+
+ at interface WebError (WebExtras)
+ at end
+
+ at implementation WebError (WebExtras)
+
++ (void)initialize
+{
+ pthread_once(&categoryInitializeControl, categoryInitialize);
+}
+
+ at end
+
+static void categoryInitialize()
+{
+ 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],
+ WebErrorDescriptionFinderCannotOpenDirectory, [NSNumber numberWithInt: WebKitErrorFinderCannotOpenDirectory],
+ WebErrorDescriptionCannotShowDirectory, [NSNumber numberWithInt: WebKitErrorCannotShowDirectory],
+ WebErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
+ WebErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebKitErrorCannotShowURL],
+ WebErrorDescriptionCannotFindApplicationForURL, [NSNumber numberWithInt: WebKitErrorCannotNotFindApplicationForURL],
+ WebErrorDescriptionWebErrorCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
+ WebErrorDescriptionWebErrorCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugin],
+ WebErrorDescriptionWebErrorJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
+ WebErrorDescriptionDownloadDecodingFailedToComplete, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedToComplete],
+ WebErrorDescriptionDownloadDecodingFailedMidStream, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedMidStream],
+ nil];
+
+ [WebError addErrorsWithCodesAndDescriptions:dict inDomain:WebErrorDomainWebKit];
+
+ [pool release];
+}
\ No newline at end of file
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index b8d65c3..62b28db 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -8,6 +8,7 @@
.objc_class_name_WebDebugDOMNode
.objc_class_name_WebDefaultContextMenuDelegate
.objc_class_name_WebDefaultPolicyDelegate
+.objc_class_name_WebDownload
.objc_class_name_WebFormDelegate
.objc_class_name_WebFrame
.objc_class_name_WebHTMLView
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 88d84c3..fdcf99a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -419,6 +419,7 @@
832B2D1703B10990009CF105,
84A992C503CE696800CA2ACA,
2D81DAB503EB0B2D00A80166,
+ 83730F9903FB1E660004736E,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -494,6 +495,7 @@
F5934C8902E894F50197FBCF,
2568C72C0174912D0ECA149E,
F5927D4E02D26C5E01CA2DBB,
+ 83730F9803FB1E660004736E,
9367C636034E9F00008635C5,
7082F56F038EADAA00A80180,
7082F570038EADAA00A80180,
@@ -1844,6 +1846,18 @@
settings = {
};
};
+ 83730F9803FB1E660004736E = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebKitErrors.m;
+ refType = 4;
+ };
+ 83730F9903FB1E660004736E = {
+ fileRef = 83730F9803FB1E660004736E;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
8398847A03426FB000BC5F5E = {
fileEncoding = 4;
isa = PBXFileReference;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 8e025e1..91f19ae 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -26,7 +26,6 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceRequest.h>
@@ -35,49 +34,8 @@ enum {
SpaceKey = 0x0020
};
-NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
-
@implementation WebView
-#define WebErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebErrorCannotCreateFile description")
-#define WebErrorDescriptionCannotOpenFile UI_STRING("Cannot open file", "WebErrorCannotOpenFile description")
-#define WebErrorDescriptionCannotWriteToFile UI_STRING("Cannot write file", "WebErrorCannotWriteToFile description")
-#define WebErrorDescriptionCannotRemoveFile UI_STRING("Cannot remove file", "WebErrorCannotRemoveFile description")
-#define WebErrorDescriptionCannotFindApplicationForFile UI_STRING("Cannot find application for file", "WebErrorCannotFindApplicationForFile description")
-#define WebErrorDescriptionFinderCannotOpenDirectory UI_STRING("Finder cannot open directory", "WebErrorFinderCannotOpenDirectory description")
-#define WebErrorDescriptionCannotShowDirectory UI_STRING("Cannot show a file directory", "WebErrorCannotShowDirectory description")
-#define WebErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebErrorCannotShowMIMEType description")
-#define WebErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebErrorCannotShowURL description")
-#define WebErrorDescriptionCannotFindApplicationForURL UI_STRING("Cannot find application for URL", "WebErrorCannotNotFindApplicationForURL description")
-#define WebErrorDescriptionWebErrorCannotFindPlugin UI_STRING("Cannot find plug-in", "WebErrorCannotFindPlugin description")
-#define WebErrorDescriptionWebErrorCannotLoadPlugin UI_STRING("Cannot load plug-in", "WebErrorCannotLoadPlugin description")
-#define WebErrorDescriptionWebErrorJavaUnavailable UI_STRING("Java is unavailable", "WebErrorJavaUnavailable description")
-#define WebErrorDescriptionDownloadDecodingFailedToComplete UI_STRING_KEY("Download decoding failed", "Download decoding failed (at end)", "WebErrorDownloadDecodingFailedToComplete description")
-#define WebErrorDescriptionDownloadDecodingFailedMidStream UI_STRING_KEY("Download decoding failed", "Download decoding failed (midstream)", "WebErrorDownloadDecodingFailedMidStream description")
-
-+ (void)initialize
-{
- NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
- WebErrorDescriptionCannotCreateFile, [NSNumber numberWithInt: WebKitErrorCannotCreateFile],
- WebErrorDescriptionCannotOpenFile, [NSNumber numberWithInt: WebKitErrorCannotOpenFile],
- WebErrorDescriptionCannotWriteToFile, [NSNumber numberWithInt: WebKitErrorCannotWriteToFile],
- WebErrorDescriptionCannotRemoveFile, [NSNumber numberWithInt: WebKitErrorCannotRemoveFile],
- WebErrorDescriptionCannotFindApplicationForFile, [NSNumber numberWithInt: WebKitErrorCannotFindApplicationForFile],
- WebErrorDescriptionFinderCannotOpenDirectory, [NSNumber numberWithInt: WebKitErrorFinderCannotOpenDirectory],
- WebErrorDescriptionCannotShowDirectory, [NSNumber numberWithInt: WebKitErrorCannotShowDirectory],
- WebErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
- WebErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebKitErrorCannotShowURL],
- WebErrorDescriptionCannotFindApplicationForURL, [NSNumber numberWithInt: WebKitErrorCannotNotFindApplicationForURL],
- WebErrorDescriptionWebErrorCannotFindPlugin, [NSNumber numberWithInt: WebKitErrorCannotFindPlugin],
- WebErrorDescriptionWebErrorCannotLoadPlugin, [NSNumber numberWithInt: WebKitErrorCannotLoadPlugin],
- WebErrorDescriptionWebErrorJavaUnavailable, [NSNumber numberWithInt: WebKitErrorJavaUnavailable],
- WebErrorDescriptionDownloadDecodingFailedToComplete,[NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedToComplete],
- WebErrorDescriptionDownloadDecodingFailedMidStream, [NSNumber numberWithInt: WebKitErrorDownloadDecodingFailedMidStream],
- nil];
-
- [WebError addErrorsWithCodesAndDescriptions:dict inDomain:WebErrorDomainWebKit];
-}
-
- initWithFrame: (NSRect) frame
{
[super initWithFrame: frame];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list