Index: Source/core/platform/graphics/skia/FontCacheSkia.cpp |
diff --git a/Source/core/platform/graphics/skia/FontCacheSkia.cpp b/Source/core/platform/graphics/skia/FontCacheSkia.cpp |
index 958b60d1aca2bbe50ccf7ae2a009813e4ecb96aa..879f0bf6b478e95ea27b92781646d7934ea0ee6b 100644 |
--- a/Source/core/platform/graphics/skia/FontCacheSkia.cpp |
+++ b/Source/core/platform/graphics/skia/FontCacheSkia.cpp |
@@ -170,7 +170,14 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD |
fontDescription.computedSize(), |
fontDescription.weight() >= FontWeightBold && !tf->isBold(), |
fontDescription.italic() && !tf->isItalic(), |
- fontDescription.orientation()); |
+ fontDescription.orientation(), |
+#if OS(ANDROID) |
+ // On Android FontPlatformData from different locales need to be distinguished |
+ // to avoid conflict of glyphs from different locale-perferred fallback fonts. |
falken
2013/09/25 08:11:51
Same as previous comment.
|
+ fontDescription.locale()); |
+#else |
+ AtomicString()); |
+#endif |
tf->unref(); |
return result; |
} |