Changeset 71977 in webkit

Timestamp:

Nov 13, 2010 8:35:54 PM (13 years ago)

Author:

mitz@apple.com

Message:

fast/text/hyphen* tests have different results on Leopard
​https://bugs.webkit.org/show_bug.cgi?id=43296

Reviewed by Dave Hyatt.

• platform/text/mac/TextBreakIteratorInternalICUMac.mm:

(WebCore::topLanguagePreference): Changed to look up the value of the AppleLanguages default
through the normal NSUserDefaults search order rather than skipping the application domain.
This makes this function respect DumpRenderTree’s setting of the default in the application
domain.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/mac/TextBreakIteratorInternalICUMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-13  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        fast/text/hyphen* tests have different results on Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=43296
+
+        * platform/text/mac/TextBreakIteratorInternalICUMac.mm:
+        (WebCore::topLanguagePreference): Changed to look up the value of the AppleLanguages default
+        through the normal NSUserDefaults search order rather than skipping the application domain.
+        This makes this function respect DumpRenderTree’s setting of the default in the application
+        domain.
+
 2010-11-13  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm

@@ -39 +39 @@
 static RetainPtr<CFStringRef> topLanguagePreference()
 {
-    RetainPtr<CFPropertyListRef> languages(AdoptCF, CFPreferencesCopyValue(CFSTR("AppleLanguages"),
-        kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
-    if (!languages || CFGetTypeID(languages.get()) != CFArrayGetTypeID())
+    NSArray *languagesArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"AppleLanguages"];
+    if (!languagesArray)
         return 0;
-    CFArrayRef languagesArray = static_cast<CFArrayRef>(languages.get());
-    if (CFArrayGetCount(languagesArray) < 1)
+    if ([languagesArray count] < 1)
         return 0;
-    const void* value = CFArrayGetValueAtIndex(languagesArray, 0);
-    if (!value || CFGetTypeID(value) != CFStringGetTypeID())
+    NSString *value = [languagesArray objectAtIndex:0];
+    if (![value isKindOfClass:[NSString class]])
         return 0;
-    return static_cast<CFStringRef>(value);
+    return reinterpret_cast<CFStringRef>(value);
 }