[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:13:46 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d4b4e622406ff81fb25349170962c26e51618664
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 18 15:57:46 2003 +0000
Reviewed by Maciej.
- fixed 3487335: REGRESSION (112-113): "a:b" error message does not cite the URL properly
* Misc.subproj/WebKitErrors.m:
(+[NSError _webKitErrorWithCode:failingURL:]): Call _webKitErrorWithDomain:code:URL:.
(+[NSError _webKitErrorWithDomain:code:URL:]): Call _web_errorWithDomain:code:URL:, instead of using
the deprecated failingURL: flavor.
(-[NSError _initWithPluginErrorCode:contentURLString:pluginPageURLString:pluginName:MIMEType:]):
Change this method to call the other one.
(-[NSError _initWithPluginErrorCode:contentURL:pluginPageURL:pluginName:MIMEType:]): Implement this one,
and put in the NSErrorFailingURLKey, as well as the NSErrorFailingURLStringKey, to match what Foundation
now does for other errors.
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge viewForPluginWithURL:attributes:baseURL:MIMEType:]):
Change to use the non-deprecated flavor of the NSError call above.
* English.lproj/StringsNotToBeLocalized.txt: Updated for above changes and other recent changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5575 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8fe6581..88a70c7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2003-11-17 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3487335: REGRESSION (112-113): "a:b" error message does not cite the URL properly
+
+ * Misc.subproj/WebKitErrors.m:
+ (+[NSError _webKitErrorWithCode:failingURL:]): Call _webKitErrorWithDomain:code:URL:.
+ (+[NSError _webKitErrorWithDomain:code:URL:]): Call _web_errorWithDomain:code:URL:, instead of using
+ the deprecated failingURL: flavor.
+ (-[NSError _initWithPluginErrorCode:contentURLString:pluginPageURLString:pluginName:MIMEType:]):
+ Change this method to call the other one.
+ (-[NSError _initWithPluginErrorCode:contentURL:pluginPageURL:pluginName:MIMEType:]): Implement this one,
+ and put in the NSErrorFailingURLKey, as well as the NSErrorFailingURLStringKey, to match what Foundation
+ now does for other errors.
+
+ * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge viewForPluginWithURL:attributes:baseURL:MIMEType:]):
+ Change to use the non-deprecated flavor of the NSError call above.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Updated for above changes and other recent changes.
+
2003-11-16 Maciej Stachowiak <mjs at apple.com>
Reviewed by Dave.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index e71b542..0b1c2e4 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -4,6 +4,7 @@
" *POST*"
" *target*"
" >>>"
+"%"
"%.1lf"
"%.2lu/%.2lu/%.10lu-%.10lu.cache"
"%2d) "
@@ -36,7 +37,7 @@
"7"
"9"
"://"
-":/?"
+":/?#"
";"
"<!--framePath "
"="
@@ -47,6 +48,7 @@
"=================\nFATAL ERROR: "
"=================\nSHOULD NEVER BE REACHED (%s:%d %s)\n=================\n"
">,"
+"?"
"@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-."
"ATSUCreateStyle failed (%d)"
@@ -106,6 +108,7 @@
"NP_Initialize"
"NP_Shutdown"
"NSApplicationIcon"
+"NSErrorFailingURLKey"
"NSEvent"
"NSFileModificationDate"
"NSFileOwnerAccountName"
@@ -190,6 +193,7 @@
"WebKitSerifFont"
"WebKitShouldPrintBackgroundsPreferenceKey"
"WebKitStandardFont"
+"WebKitTabToLinksPreferenceKey"
"WebKitUserStyleSheetEnabledPreferenceKey"
"WebKitUserStyleSheetLocationPreferenceKey"
"WebMethodNotYetImplemented"
@@ -265,6 +269,7 @@
"https"
"javascript:"
"lastVisitedDate"
+"localhost"
"localized string not found"
"mailto:"
"nullplugin"
@@ -294,6 +299,7 @@ History.subproj/WebHistoryItem.m:"children"
History.subproj/WebHistoryItem.m:"title"
Misc.subproj/WebIconDatabase.m:"????"
Misc.subproj/WebKitLogging.m
+Misc.subproj/WebNSURLExtras.m:"file"
Plugins.subproj/WebBaseNetscapePluginView.m:"height"
Plugins.subproj/WebBaseNetscapePluginView.m:"width"
Plugins.subproj/WebBasePluginPackage.m:"name: %@\npath: %@\nmimeTypes:\n%@\npluginDescription:%@"
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index cf1ef34..7afd956 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -9,8 +9,10 @@
#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebLocalizableStrings.h>
#import <WebKit/WebNSURLExtras.h>
+
#import <Foundation/NSError_NSURLExtras.h>
#import <pthread.h>
@@ -42,18 +44,15 @@ static void registerErrors(void);
pthread_once(®isterErrorsControl, registerErrors);
}
-+ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL
++ (NSError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URLString
{
- [self _registerWebKitErrors];
-
- return [self _web_errorWithDomain:WebKitErrorDomain code:code failingURL:URL];
+ return [self _webKitErrorWithDomain:WebKitErrorDomain code:code URL:[NSURL _web_URLWithUserTypedString:URLString]];
}
+ (NSError *)_webKitErrorWithDomain:(NSString *)domain code:(int)code URL:(NSURL *)URL
{
[self _registerWebKitErrors];
-
- return [self _web_errorWithDomain:domain code:code failingURL:[URL _web_userVisibleString]];
+ return [self _web_errorWithDomain:domain code:code URL:URL];
}
- (id)_initWithPluginErrorCode:(int)code
@@ -62,14 +61,29 @@ static void registerErrors(void);
pluginName:(NSString *)pluginName
MIMEType:(NSString *)MIMEType
{
+ return [self _initWithPluginErrorCode:code
+ contentURL:[NSURL _web_URLWithUserTypedString:contentURLString]
+ pluginPageURL:[NSURL _web_URLWithUserTypedString:pluginPageURLString]
+ pluginName:pluginName
+ MIMEType:MIMEType
+ ];
+}
+
+- (id)_initWithPluginErrorCode:(int)code
+ contentURL:(NSURL *)contentURL
+ pluginPageURL:(NSURL *)pluginPageURL
+ pluginName:(NSString *)pluginName
+ MIMEType:(NSString *)MIMEType
+{
[[self class] _registerWebKitErrors];
NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
- if (contentURLString) {
- [userInfo setObject:contentURLString forKey:NSErrorFailingURLStringKey];
+ if (contentURL) {
+ [userInfo setObject:contentURL forKey:@"NSErrorFailingURLKey"];
+ [userInfo setObject:[contentURL _web_userVisibleString] forKey:NSErrorFailingURLStringKey];
}
- if (pluginPageURLString) {
- [userInfo setObject:pluginPageURLString forKey:WebKitErrorPlugInPageURLStringKey];
+ if (pluginPageURL) {
+ [userInfo setObject:[pluginPageURL _web_userVisibleString] forKey:WebKitErrorPlugInPageURLStringKey];
}
if (pluginName) {
[userInfo setObject:pluginName forKey:WebKitErrorPlugInNameKey];
@@ -78,7 +92,7 @@ static void registerErrors(void);
[userInfo setObject:MIMEType forKey:WebKitErrorMIMETypeKey];
}
- NSDictionary *userInfoCopy = [userInfo count] > 0 ? [[NSDictionary alloc] initWithDictionary:userInfo] : nil;
+ NSDictionary *userInfoCopy = [userInfo count] > 0 ? [[NSDictionary alloc] initWithDictionary:userInfo] : nil;
[userInfo release];
NSError *error = [self initWithDomain:WebKitErrorDomain code:code userInfo:userInfoCopy];
[userInfoCopy release];
@@ -86,20 +100,6 @@ static void registerErrors(void);
return error;
}
-- (id)_initWithPluginErrorCode:(int)code
- contentURL:(NSURL *)contentURL
- pluginPageURL:(NSURL *)pluginPageURL
- pluginName:(NSString *)pluginName
- MIMEType:(NSString *)MIMEType
-{
- return [self _initWithPluginErrorCode:code
- contentURLString:[contentURL _web_userVisibleString]
- pluginPageURLString:[pluginPageURL _web_userVisibleString]
- pluginName:pluginName
- MIMEType:MIMEType
- ];
-}
-
@end
static void registerErrors()
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6a89f96..dc6e98f 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -705,8 +705,8 @@
if (errorCode) {
NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
- contentURLString:[URL _web_userVisibleString]
- pluginPageURLString:[attributes objectForKey:@"pluginspage"]
+ contentURL:URL
+ pluginPageURL:[NSURL _web_URLWithUserTypedString:[attributes objectForKey:@"pluginspage"]]
pluginName:[pluginPackage name]
MIMEType:MIMEType];
view = [[[WebNullPluginView alloc] initWithFrame:NSZeroRect error:error] autorelease];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list