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

Unified Diff: src/core/SkFontHost.cpp

Issue 488083004: Remove SK_FONT_HOST_DOES_NOT_USE_FONTMGR and guarded code. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | src/ports/SkFontHost_fontconfig.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkFontHost.cpp
diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp
index a16a8c42e02956274090876e842f6a5c3c68e3a2..a4055a1d8a10a1cbd57cbb54a74a98711a33d017 100644
--- a/src/core/SkFontHost.cpp
+++ b/src/core/SkFontHost.cpp
@@ -210,21 +210,6 @@ SkFontMgr* SkFontMgr::RefDefault() {
//////////////////////////////////////////////////////////////////////////
-#ifndef SK_FONTHOST_DOES_NOT_USE_FONTMGR
-
-#if 0
-static SkFontStyle TypefaceStyleBitsToFontStyle(SkTypeface::Style styleBits) {
- SkFontStyle::Weight weight = (styleBits & SkTypeface::kBold) ?
- SkFontStyle::kBold_Weight :
- SkFontStyle::kNormal_Weight;
- SkFontStyle::Width width = SkFontStyle::kNormal_Width;
- SkFontStyle::Slant slant = (styleBits & SkTypeface::kItalic) ?
- SkFontStyle::kUpright_Slant :
- SkFontStyle::kItalic_Slant;
- return SkFontStyle(weight, width, slant);
-}
-#endif
-
SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
const char familyName[],
SkTypeface::Style style) {
@@ -252,5 +237,3 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
return fm->createFromStream(stream);
}
-
-#endif
« no previous file with comments | « no previous file | src/ports/SkFontHost_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698