Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: Source/core/platform/graphics/skia/FontCacheSkia.cpp

Issue 23503080: Pass DOM locale to Skia in FontCache::getFontDataForCharacter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@fontcleanup
Patch Set: Pure Android only Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698