+2006-10-06 Alexey Proskuryakov <ap@nypop.com>
+
+ 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 <mjs@apple.com>
Reviewed by Adam.
- (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