[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 432687ccd1b884248b5e6fa5ead11046e4659063
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 14 04:35:54 2010 +0000

    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.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 733d7db..ccea03e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-13  Dan Bernstein  <mitz at 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 at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm b/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm
index 5da10e0..6af5616 100644
--- a/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm
+++ b/WebCore/platform/text/mac/TextBreakIteratorInternalICUMac.mm
@@ -38,17 +38,15 @@ static inline RetainPtr<CFStringRef> textBreakLocalePreference()
 
 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);
 }
 
 static RetainPtr<CFStringRef> canonicalLanguageIdentifier(CFStringRef locale)

-- 
WebKit Debian packaging