diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/platform/win/Language.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/platform/win/Language.cpp')
| -rw-r--r-- | WebCore/platform/win/Language.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/win/Language.cpp b/WebCore/platform/win/Language.cpp index 787c5a3..588c5df 100644 --- a/WebCore/platform/win/Language.cpp +++ b/WebCore/platform/win/Language.cpp @@ -37,11 +37,11 @@ static String localeInfo(LCTYPE localeType, const String& fallback) int localeChars = GetLocaleInfo(langID, localeType, 0, 0); if (!localeChars) return fallback; - Vector<WCHAR> localeNameBuf(localeChars); - localeChars = GetLocaleInfo(langID, localeType, localeNameBuf.data(), localeChars); + UChar* localeNameBuf; + String localeName = String::createUninitialized(localeChars, localeNameBuf); + localeChars = GetLocaleInfo(langID, localeType, localeNameBuf, localeChars); if (!localeChars) return fallback; - String localeName = String::adopt(localeNameBuf); if (localeName.isEmpty()) return fallback; |