diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/chromium/src/gtk/WebFontInfo.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/chromium/src/gtk/WebFontInfo.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/gtk/WebFontInfo.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/src/gtk/WebFontInfo.cpp b/Source/WebKit/chromium/src/gtk/WebFontInfo.cpp index dd25eb1..94b75de 100644 --- a/Source/WebKit/chromium/src/gtk/WebFontInfo.cpp +++ b/Source/WebKit/chromium/src/gtk/WebFontInfo.cpp @@ -38,7 +38,7 @@ namespace WebKit { -WebCString WebFontInfo::familyForChars(const WebUChar* characters, size_t numCharacters) +WebCString WebFontInfo::familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale) { FcCharSet* cset = FcCharSetCreate(); for (size_t i = 0; i < numCharacters; ++i) { @@ -62,6 +62,13 @@ WebCString WebFontInfo::familyForChars(const WebUChar* characters, size_t numCha fcvalue.u.b = FcTrue; FcPatternAdd(pattern, FC_SCALABLE, fcvalue, FcFalse); + if (preferredLocale) { + FcLangSet* langset = FcLangSetCreate(); + FcLangSetAdd(langset, reinterpret_cast<const FcChar8 *>(preferredLocale)); + FcPatternAddLangSet(pattern, FC_LANG, langset); + FcLangSetDestroy(langset); + } + FcConfigSubstitute(0, pattern, FcMatchPattern); FcDefaultSubstitute(pattern); |