summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/chromium/LanguageChromium.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
commit8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch)
tree17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/chromium/LanguageChromium.cpp
parentb9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff)
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/chromium/LanguageChromium.cpp')
-rw-r--r--Source/WebCore/platform/chromium/LanguageChromium.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/chromium/LanguageChromium.cpp b/Source/WebCore/platform/chromium/LanguageChromium.cpp
index 46cc8add6..4544e42a1 100644
--- a/Source/WebCore/platform/chromium/LanguageChromium.cpp
+++ b/Source/WebCore/platform/chromium/LanguageChromium.cpp
@@ -40,8 +40,10 @@ namespace WebCore {
static String platformLanguage()
{
DEFINE_STATIC_LOCAL(String, computedDefaultLanguage, ());
- if (computedDefaultLanguage.isEmpty())
+ if (computedDefaultLanguage.isEmpty()) {
computedDefaultLanguage.append(WebKit::Platform::current()->defaultLocale());
+ ASSERT(!computedDefaultLanguage.isEmpty());
+ }
return computedDefaultLanguage;
}