diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-01-03 13:32:36 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-04 14:51:09 +0000 |
| commit | 3546ff10c2e1e91f5afe1efaab4e5e14f71689d1 (patch) | |
| tree | cbcf83ae724df22c6cc5704a75be9095a28058db /include/ports/SkFontMgr_android.h | |
| parent | 8bc9f7b32867cb46fd7b56c11bf9dfa79a7d246e (diff) | |
Stage SkFontMgr factories to return smart pointers.
All the SkFontMgr factories currently return bare pointers and sometimes
even document the ownership rules. Since such factories can be
implemented by external ports, the ownership rules should be explicit in
order to prevent simple reference counting issues.
Change-Id: I25b598ce0954cd473a3fb1f8adc0cb86331583ca
Reviewed-on: https://skia-review.googlesource.com/6533
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/ports/SkFontMgr_android.h')
| -rw-r--r-- | include/ports/SkFontMgr_android.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/ports/SkFontMgr_android.h b/include/ports/SkFontMgr_android.h index f12f51f36a..9ed435dc0d 100644 --- a/include/ports/SkFontMgr_android.h +++ b/include/ports/SkFontMgr_android.h @@ -47,6 +47,10 @@ struct SkFontMgr_Android_CustomFonts { }; /** Create a font manager for Android. If 'custom' is NULL, use only system fonts. */ +#ifdef SK_LEGACY_FONTMGR_FACTORY SK_API SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom); +#else +SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom); +#endif #endif // SkFontMgr_android_DEFINED |