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

Unified Diff: skia/ext/fontmgr_default_android.cc

Issue 2618443002: Remove use of legacy SkFontMgr factories. (Closed)
Patch Set: Another include. Created 3 years, 11 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
Index: skia/ext/fontmgr_default_android.cc
diff --git a/skia/ext/fontmgr_default_android.cc b/skia/ext/fontmgr_default_android.cc
index 668cb5634d65d73a7de709de89695b7357bb314d..1bbd9d1d0ec2188c4d0f72a91a89f1567f1c8133 100644
--- a/skia/ext/fontmgr_default_android.cc
+++ b/skia/ext/fontmgr_default_android.cc
@@ -8,14 +8,15 @@
#include "third_party/skia/include/ports/SkFontMgr_android.h"
namespace {
+// An owning leaky bare pointer.
SkFontMgr* g_default_fontmgr;
} // namespace
-SK_API void SetDefaultSkiaFactory(SkFontMgr* fontmgr) {
- g_default_fontmgr = fontmgr;
+SK_API void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) {
+ g_default_fontmgr = fontmgr.release();
}
-SK_API SkFontMgr* SkFontMgr::Factory() {
- return g_default_fontmgr ? SkRef(g_default_fontmgr)
+SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
+ return g_default_fontmgr ? sk_ref_sp(g_default_fontmgr)
: SkFontMgr_New_Android(nullptr);
}

Powered by Google App Engine
This is Rietveld 408576698