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

Unified Diff: include/core/SkTypeface.h

Issue 2030983002: Remove SK_SUPPORT_LEGACY_TYPEFACE_MAKE_FROM_NAME. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 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/core/SkTypeface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkTypeface.h
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index f67ba37416272c8a82c8a0d2a19f9a28cd444116..8c943d199cdacee6b4c2361529a52657ebd77351 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -109,20 +109,8 @@ public:
@return reference to the closest-matching typeface. Call must call
unref() when they are done.
*/
- static sk_sp<SkTypeface> MakeFromName(const char familyName[],
- SkFontStyle fontStyle);
+ static sk_sp<SkTypeface> MakeFromName(const char familyName[], SkFontStyle fontStyle);
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_MAKE_FROM_NAME
- /** Return the typeface that most closely matches the requested familyName and style.
- Pass nullptr as the familyName to request the default font for the requested style.
- Will never return nullptr.
-
- @param familyName May be NULL. The name of the font family.
- @param style The style (normal, bold, italic) of the typeface.
- @return the closest-matching typeface.
- */
- static sk_sp<SkTypeface> MakeFromName(const char familyName[], Style style);
-#endif
#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
static SkTypeface* CreateFromName(const char familyName[], Style style) {
return MakeFromName(familyName, SkFontStyle::FromOldStyle(style)).release();
« no previous file with comments | « no previous file | src/core/SkTypeface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698