[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 63aac7f08cb366d6999f37a3f752964d95c94da3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 21:15:28 2010 +0000

    2010-01-12  Jungshik Shin  <jshin at chromium.org>
    
            Reviewed by Darin Adler
    
            https://bugs.webkit.org/show_bug.cgi?id=31597
    
            Make ICU's text breakiterator and string search use Chrome's UI
            language instead of 'en-US' or the OS UI language.
    
            As long as the webkit layout tests are run in en-US locale, there'd be
            no visible change.
    
            * platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp:
            (UILanguage):
            (WebCore::currentSearchLocaleID):
            (WebCore::currentTextBreakLocaleID):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53159 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 16bb8a1..1e08773 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-12  Jungshik Shin  <jshin at chromium.org>
+
+        Reviewed by Darin Adler
+
+        https://bugs.webkit.org/show_bug.cgi?id=31597
+
+        Make ICU's text breakiterator and string search use Chrome's UI
+        language instead of 'en-US' or the OS UI language.
+
+        As long as the webkit layout tests are run in en-US locale, there'd be 
+        no visible change.
+
+        * platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp:
+        (UILanguage):
+        (WebCore::currentSearchLocaleID):
+        (WebCore::currentTextBreakLocaleID):
+
 2010-01-12  Beth Dakin  <bdakin at apple.com>
 
         Rubber-stamped by Dave Hyatt.
diff --git a/WebCore/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp b/WebCore/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp
index 4e2aceb..9adb999 100644
--- a/WebCore/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp
+++ b/WebCore/platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp
@@ -22,18 +22,29 @@
 #include "config.h"
 #include "TextBreakIteratorInternalICU.h"
 
+#include "CString.h"
+#include "Language.h"
+#include "PlatformString.h"
+#include <wtf/StdLibExtras.h>
+
 namespace WebCore {
 
+static const char* UILanguage()
+{
+    // Chrome's UI language can be different from the OS UI language on Windows.
+    // We want to return Chrome's UI language here.
+    DEFINE_STATIC_LOCAL(CString, locale, (defaultLanguage().latin1()));
+    return locale.data();
+}
+
 const char* currentSearchLocaleID()
 {
-    // FIXME: Should use system locale.
-    return "";
+    return UILanguage();
 }
 
 const char* currentTextBreakLocaleID()
 {
-    // FIXME: Should use system locale.
-    return "en_us";
+    return UILanguage();
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging