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

Unified Diff: skia/ports/SkFontHost_fontconfig.cpp

Issue 11284: Match Windows font metrics on Linux. (Closed)
Patch Set: Addressing comments Created 12 years, 1 month 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
« no previous file with comments | « no previous file | webkit/port/platform/graphics/chromium/FontPlatformDataLinux.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ports/SkFontHost_fontconfig.cpp
diff --git a/skia/ports/SkFontHost_fontconfig.cpp b/skia/ports/SkFontHost_fontconfig.cpp
index cb95a60161418112dc67e19e36e6560a31fd0dbf..f36bb2e50b3016c745c3dc31b6add4cb0848a682 100644
--- a/skia/ports/SkFontHost_fontconfig.cpp
+++ b/skia/ports/SkFontHost_fontconfig.cpp
@@ -278,13 +278,8 @@ void SkFontHost::Serialize(const SkTypeface*, SkWStream*) {
SkScalerContext* SkFontHost::CreateFallbackScalerContext
(const SkScalerContext::Rec& rec) {
- FcPattern* pattern = FcPatternCreate();
- FcConfigSubstitute(0, pattern, FcMatchPattern);
- FcDefaultSubstitute(pattern);
-
- FcResult result;
- FcPattern* match = FcFontMatch(0, pattern, &result);
- FcPatternDestroy(pattern);
+ FcPattern* match = FontMatch(FC_FAMILY, FcTypeString, "serif",
+ NULL);
// This will fail when we have no fonts on the system.
SkASSERT(match);
« no previous file with comments | « no previous file | webkit/port/platform/graphics/chromium/FontPlatformDataLinux.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698