diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-18 14:34:30 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-18 14:34:30 +0000 |
| commit | 38249475041ab3a1ca68b08670b07335c26c94d7 (patch) | |
| tree | 5b3ca8e4637b8d194db5f5d96b70457a60bd99a6 /skia/ports/SkFontHost_fontconfig.cpp | |
| parent | 60b5184a4bdb8f6d26a529a40ec7470bd1dfd994 (diff) | |
| download | chromium_src-38249475041ab3a1ca68b08670b07335c26c94d7.zip chromium_src-38249475041ab3a1ca68b08670b07335c26c94d7.tar.gz chromium_src-38249475041ab3a1ca68b08670b07335c26c94d7.tar.bz2 | |
Revert 5595
Review URL: http://codereview.chromium.org/11230
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ports/SkFontHost_fontconfig.cpp')
| -rw-r--r-- | skia/ports/SkFontHost_fontconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/skia/ports/SkFontHost_fontconfig.cpp b/skia/ports/SkFontHost_fontconfig.cpp index cb95a60..2836db3 100644 --- a/skia/ports/SkFontHost_fontconfig.cpp +++ b/skia/ports/SkFontHost_fontconfig.cpp @@ -206,7 +206,7 @@ SkTypeface* SkFontHost::FindTypeface(const SkTypeface* familyFace, FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL; const int italic = style & SkTypeface::kItalic ? FC_SLANT_ITALIC : FC_SLANT_ROMAN; - FcPattern* match = FontMatch(FC_FAMILY, FcTypeString, resolved_family_name, + FcPattern* match = FontMatch(FC_FULLNAME, FcTypeString, resolved_family_name, FC_WEIGHT, FcTypeInteger, bold, FC_SLANT, FcTypeInteger, italic, NULL); @@ -301,14 +301,14 @@ SkScalerContext* SkFontHost::CreateFallbackScalerContext SkAutoDescriptor ad(sizeof(rec) + SkDescriptor::ComputeOverhead(1)); SkDescriptor* desc = ad.getDesc(); - + desc->init(); SkScalerContext::Rec* newRec = (SkScalerContext::Rec*)desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec); newRec->fFontID = id; desc->computeChecksum(); - + return SkFontHost::CreateScalerContext(desc); } |