diff options
Diffstat (limited to 'webkit/api/src/ChromiumBridge.cpp')
| -rw-r--r-- | webkit/api/src/ChromiumBridge.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp index e48b4b7..b668178 100644 --- a/webkit/api/src/ChromiumBridge.cpp +++ b/webkit/api/src/ChromiumBridge.cpp @@ -208,8 +208,13 @@ String ChromiumBridge::getFontFamilyForCharacters(const UChar* characters, size_ { if (webKitClient()->sandboxSupport()) return webKitClient()->sandboxSupport()->getFontFamilyForCharacters(characters, numCharacters); - else - return WebFontInfo::familyForChars(characters, numCharacters); + else { + WebCString family = WebFontInfo::familyForChars(characters, numCharacters); + if (family.data()) + return WebString::fromUTF8(family.data()); + else + return WebString(); + } } #endif |