auto import from //depot/cupcake/@136594

1 files changed, 2 insertions, 48 deletions

diff --git a/WebKit/mac/Misc/WebKitNSStringExtras.m b/WebKit/mac/Misc/WebKitNSStringExtras.m
index 157069a..2e75e9e 100644
--- a/WebKit/mac/Misc/WebKitNSStringExtras.m
+++ b/WebKit/mac/Misc/WebKitNSStringExtras.m
@@ -140,58 +140,12 @@ static BOOL canUseFastRenderer(const UniChar *buffer, unsigned length)
 
 + (NSStringEncoding)_web_encodingForResource:(Handle)resource
 {
-    short resRef = HomeResFile(resource);
-    if (ResError() != noErr) {
-        return NSMacOSRomanStringEncoding;
-    }
-    
-    // Get the FSRef for the current resource file
-    FSRef fref;
-    OSStatus error = FSGetForkCBInfo(resRef, 0, NULL, NULL, NULL, &fref, NULL);
-    if (error != noErr) {
-        return NSMacOSRomanStringEncoding;
-    }
-    
-    CFURLRef URL = CFURLCreateFromFSRef(NULL, &fref);
-    if (URL == NULL) {
-        return NSMacOSRomanStringEncoding;
-    }
-    
-    NSString *path = [(NSURL *)URL path];
-    CFRelease(URL);
-    
-    // Get the lproj directory name
-    path = [path stringByDeletingLastPathComponent];
-    if (![[path pathExtension] _webkit_isCaseInsensitiveEqualToString:@"lproj"]) {
-        return NSMacOSRomanStringEncoding;
-    }
-    
-    NSString *directoryName = [[path stringByDeletingPathExtension] lastPathComponent];
-    CFStringRef locale = CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, (CFStringRef)directoryName);
-    if (locale == NULL) {
-        return NSMacOSRomanStringEncoding;
-    }
-            
-    LangCode lang;
-    RegionCode region;
-    error = LocaleStringToLangAndRegionCodes([(NSString *)locale UTF8String], &lang, &region);
-    CFRelease(locale);
-    if (error != noErr) {
-        return NSMacOSRomanStringEncoding;
-    }
-    
-    TextEncoding encoding;
-    error = UpgradeScriptInfoToTextEncoding(kTextScriptDontCare, lang, region, NULL, &encoding);
-    if (error != noErr) {
-        return NSMacOSRomanStringEncoding;
-    }
-    
-    return CFStringConvertEncodingToNSStringEncoding(encoding);
+    return CFStringConvertEncodingToNSStringEncoding(stringEncodingForResource(resource));
 }
 
 - (BOOL)_webkit_isCaseInsensitiveEqualToString:(NSString *)string
 {
-  return [self compare:string options:(NSCaseInsensitiveSearch|NSLiteralSearch)] == NSOrderedSame;
+    return stringIsCaseInsensitiveEqualToString(self, string);
 }
 
 -(BOOL)_webkit_hasCaseInsensitivePrefix:(NSString *)prefix