summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/text/LocaleToScriptMappingDefault.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/text/LocaleToScriptMappingDefault.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/text/LocaleToScriptMappingDefault.cpp')
-rw-r--r--Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp b/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp
index 909473849..58264907d 100644
--- a/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp
+++ b/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp
@@ -166,7 +166,7 @@ UScriptCode scriptNameToCode(const String& scriptName)
HashMap<String, UScriptCode>::iterator it = scriptNameCodeMap.find(scriptName.lower());
if (it != scriptNameCodeMap.end())
- return it->second;
+ return it->value;
return USCRIPT_INVALID_CODE;
}
@@ -389,7 +389,7 @@ UScriptCode localeToScriptCodeForFontSelection(const String& locale)
while (!canonicalLocale.isEmpty()) {
HashMap<String, UScriptCode>::iterator it = localeScriptMap.find(canonicalLocale);
if (it != localeScriptMap.end())
- return it->second;
+ return it->value;
size_t pos = canonicalLocale.reverseFind('_');
if (pos == notFound)
break;