Changeset 185816 in webkit

Timestamp:

Jun 21, 2015 9:25:18 PM (9 years ago)

Author:

ap@apple.com

Message:

REGRESSION (r172975): navigator.language unable to tell region for Traditional Chinese users
​https://bugs.webkit.org/show_bug.cgi?id=146121
rdar://problem/21395180

Reviewed by Darin Adler.

Source/WebCore:

Revert to previous behavior, which is wrong in many ways, but not as wrong as the new one.

• platform/mac/Language.mm:

(WebCore::httpStyleLanguageCode):
(WebCore::platformUserPreferredLanguages):

• platform/spi/cf/CFBundleSPI.h:

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/mac/NavigatorLanguage.mm: Added.

(-[NavigatorLanguageDelegate webView:didFinishLoadForFrame:]):
(TestWebKitAPI::overrideAppleLanguages):
(TestWebKitAPI::languageForSystemLanguage):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/Language.mm (modified) (2 diffs)
• Source/WebCore/platform/spi/cf/CFBundleSPI.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/mac/NavigatorLanguage.mm (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-21  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r172975): navigator.language unable to tell region for Traditional Chinese users
+        https://bugs.webkit.org/show_bug.cgi?id=146121
+        rdar://problem/21395180
+
+        Reviewed by Darin Adler.
+
+        Revert to previous behavior, which is wrong in many ways, but not as wrong as the new one.
+
+        * platform/mac/Language.mm:
+        (WebCore::httpStyleLanguageCode):
+        (WebCore::platformUserPreferredLanguages):
+        * platform/spi/cf/CFBundleSPI.h:
+
 2015-06-19  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/mac/Language.mm

@@ -28 +28 @@
 
 #import "BlockExceptions.h"
+#import "CFBundleSPI.h"
 #import "WebCoreNSStringExtras.h"
 #import <mutex>
@@ -80 +81 @@
 static String httpStyleLanguageCode(NSString *language)
 {
-    return [[NSLocale canonicalLanguageIdentifierFromString:canonicalLocaleName(language)] lowercaseString];
+    SInt32 languageCode;
+    SInt32 regionCode; 
+    SInt32 scriptCode; 
+    CFStringEncoding stringEncoding; 
+
+    // FIXME: This transformation is very wrong:
+    // 1. There is no reason why CFBundle localization names would be at all related to language names as used on the Web.
+    // 2. Script Manager codes cannot represent all languages that are now supported by the platform, so the conversion is lossy.
+    // 3. This should probably match what is sent by the network layer as Accept-Language, but currently, that's implemented separately.
+    CFBundleGetLocalizationInfoForLocalization((CFStringRef)language, &languageCode, &regionCode, &scriptCode, &stringEncoding);
+    RetainPtr<CFStringRef> preferredLanguageCode = adoptCF(CFBundleCopyLocalizationForLocalizationInfo(languageCode, regionCode, scriptCode, stringEncoding));
+    if (preferredLanguageCode)
+        language = (NSString *)preferredLanguageCode.get();
+
+    // Make the string lowercase.
+    NSString *lowercaseLanguageCode = [language lowercaseString];
+
+    // Turn a '_' into a '-' if it appears after a 2-letter language code.
+    if ([lowercaseLanguageCode length] >= 3 && [lowercaseLanguageCode characterAtIndex:2] == '_') {
+        RetainPtr<NSMutableString> mutableLanguageCode = adoptNS([lowercaseLanguageCode mutableCopy]);
+        [mutableLanguageCode.get() replaceCharactersInRange:NSMakeRange(2, 1) withString:@"-"];
+        return mutableLanguageCode.get();
+    }
+
+    return lowercaseLanguageCode;
 }
 

trunk/Source/WebCore/platform/spi/cf/CFBundleSPI.h

@@ -37 +37 @@
 extern "C" {
 void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap);
+
+Boolean CFBundleGetLocalizationInfoForLocalization(CFStringRef localizationName, SInt32 *languageCode, SInt32 *regionCode, SInt32 *scriptCode, CFStringEncoding *stringEncoding);
+CFStringRef CFBundleCopyLocalizationForLocalizationInfo(SInt32 languageCode, SInt32 regionCode, SInt32 scriptCode, CFStringEncoding stringEncoding);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-21  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r172975): navigator.language unable to tell region for Traditional Chinese users
+        https://bugs.webkit.org/show_bug.cgi?id=146121
+        rdar://problem/21395180
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/mac/NavigatorLanguage.mm: Added.
+        (-[NavigatorLanguageDelegate webView:didFinishLoadForFrame:]):
+        (TestWebKitAPI::overrideAppleLanguages):
+        (TestWebKitAPI::languageForSystemLanguage):
+        (TestWebKitAPI::TEST):
+
 2015-06-21  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -295 +295 @@
                 E1220DCA155B28AA0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */; };
                 E194E1BD177E53C7009C4D4E /* StopLoadingFromDidReceiveResponse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E194E1BC177E534A009C4D4E /* StopLoadingFromDidReceiveResponse.html */; };
+                E19DB9791B32137C00DB38D4 /* NavigatorLanguage.mm in Sources */ = {isa = PBXBuildFile; fileRef = E19DB9781B32137C00DB38D4 /* NavigatorLanguage.mm */; };
                 E40019331ACE9B88001B0A2A /* BloomFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */; };
                 F660AA1115A5F631003A1243 /* GetInjectedBundleInitializationUserDataCallback_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F660AA0F15A5F624003A1243 /* GetInjectedBundleInitializationUserDataCallback_Bundle.cpp */; };
@@ -716 +717 @@
                 E194E1BA177E5145009C4D4E /* StopLoadingFromDidReceiveResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StopLoadingFromDidReceiveResponse.mm; sourceTree = "<group>"; };
                 E194E1BC177E534A009C4D4E /* StopLoadingFromDidReceiveResponse.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = StopLoadingFromDidReceiveResponse.html; sourceTree = "<group>"; };
+                E19DB9781B32137C00DB38D4 /* NavigatorLanguage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigatorLanguage.mm; sourceTree = "<group>"; };
                 E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BloomFilter.cpp; sourceTree = "<group>"; };
                 E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TypingStyleCrash.mm; sourceTree = "<group>"; };
@@ -1213 +1215 @@
                                 517E7DFB15110EA600D0B008 /* MemoryCachePruneWithinResourceLoadDelegate.mm */,
                                 7A99D9931AD4A29D00373141 /* MenuTypesForMouseEvents.mm */,
+                                E19DB9781B32137C00DB38D4 /* NavigatorLanguage.mm */,
                                 A57A34EF16AF677200C2501F /* PageVisibilityStateWithWindowChanges.mm */,
                                 00BC16851680FE810065F1E5 /* PublicSuffix.mm */,
@@ -1619 +1622 @@
                                 260BA5791B1D2E7B004FA07C /* DFACombiner.cpp in Sources */,
                                 7A99D9941AD4A29D00373141 /* MenuTypesForMouseEvents.mm in Sources */,
+                                E19DB9791B32137C00DB38D4 /* NavigatorLanguage.mm in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;