Index: Source/core/platform/graphics/chromium/FontCacheAndroid.cpp |
diff --git a/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp b/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp |
index 2cf212a8b0254dc17a8294798dab6ebe67f64515..d8f7e23d8141126a78ad32c7b55d2fb818d6d728 100644 |
--- a/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp |
+++ b/Source/core/platform/graphics/chromium/FontCacheAndroid.cpp |
@@ -42,7 +42,8 @@ namespace WebCore { |
PassRefPtr<SimpleFontData> FontCache::getFontDataForCharacter(const Font& font, UChar32 c) |
{ |
SkString skiaFamilyName; |
- if (!SkGetFallbackFamilyNameForChar(c, &skiaFamilyName) || skiaFamilyName.isEmpty()) |
+ if (!SkGetFallbackFamilyNameForChar(c, font.fontDescription().locale().string().ascii().data(), &skiaFamilyName) |
falken
2013/09/25 08:11:51
What happens if a page has -webkit-locale: '<crazy
djsollen
2013/09/25 13:20:19
Skia uses that value to search over a list of know
|
+ || skiaFamilyName.isEmpty()) |
return 0; |
return getFontResourceData(getFontResourcePlatformData(font.fontDescription(), AtomicString(skiaFamilyName.c_str()), DoNotRetain), DoNotRetain); |
} |