Index: include/core/SkPaint.h |
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h |
index 293ffedc12aee6efac85be0ab93d685e73b859c5..7367fc642deb7bf3a5b4d4c315ba9fc635188830 100644 |
--- a/include/core/SkPaint.h |
+++ b/include/core/SkPaint.h |
@@ -614,10 +614,8 @@ |
paint |
@return typeface |
*/ |
+ SkTypeface* setTypeface(SkTypeface* typeface); |
void setTypeface(sk_sp<SkTypeface>); |
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR |
- SkTypeface* setTypeface(SkTypeface* typeface); |
-#endif |
/** Get the paint's rasterizer (or NULL). |
<p /> |