From 3c778f1110c291fd32d663826a5f6987266f24db Mon Sep 17 00:00:00 2001 From: ap Date: Fri, 6 Oct 2006 17:55:21 +0000 Subject: [PATCH] Reviewed by Darin. http://bugs.webkit.org/show_bug.cgi?id=11183 REGRESSION: Safari loads error pages unstyled * WebView/WebFrame.m: (-[WebFrame _loadHTMLString:baseURL:unreachableURL:]): Use utf-8 encoding instead of the string's "fastest" encoding. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16853 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/ChangeLog | 11 +++++++++++ WebKit/WebView/WebFrame.m | 14 ++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index 572f4eca6fa5..21a7b080aa22 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,14 @@ +2006-10-06 Alexey Proskuryakov + + Reviewed by Darin. + + http://bugs.webkit.org/show_bug.cgi?id=11183 + REGRESSION: Safari loads error pages unstyled + + * WebView/WebFrame.m: + (-[WebFrame _loadHTMLString:baseURL:unreachableURL:]): + Use utf-8 encoding instead of the string's "fastest" encoding. + 2006-10-06 Maciej Stachowiak Reviewed by Adam. diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m index 5ec0f5f7dd18..4ea751a9d0c8 100644 --- a/WebKit/WebView/WebFrame.m +++ b/WebKit/WebView/WebFrame.m @@ -2806,18 +2806,8 @@ exit: - (void)_loadHTMLString:(NSString *)string baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL { - CFStringEncoding cfencoding = CFStringGetFastestEncoding((CFStringRef)string); - NSStringEncoding nsencoding = CFStringConvertEncodingToNSStringEncoding(cfencoding); - CFStringRef cfencodingName = CFStringConvertEncodingToIANACharSetName(cfencoding); - - if (!cfencodingName || nsencoding == kCFStringEncodingInvalidId){ - NSData *data = [string dataUsingEncoding: NSUnicodeStringEncoding]; - [self _loadData:data MIMEType:nil textEncodingName:@"utf-16" baseURL:URL unreachableURL:unreachableURL]; - } - else { - NSData *data = [string dataUsingEncoding: nsencoding]; - [self _loadData:data MIMEType:nil textEncodingName:(NSString *)cfencodingName baseURL:URL unreachableURL:unreachableURL]; - } + NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding]; + [self _loadData:data MIMEType:nil textEncodingName:@"UTF-8" baseURL:URL unreachableURL:unreachableURL]; } - (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)URL -- 2.36.0