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

Unified Diff: skia/ext/fontmgr_default_linux.cc

Issue 2618443002: Remove use of legacy SkFontMgr factories. (Closed)
Patch Set: Forward declare when possible. 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
« no previous file with comments | « skia/ext/fontmgr_default_linux.h ('k') | skia/ext/fontmgr_default_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/fontmgr_default_linux.cc
diff --git a/skia/ext/fontmgr_default_linux.cc b/skia/ext/fontmgr_default_linux.cc
index abb0dbe1024c2db307f795d93cdfacd6f5b72156..22430e438c09c1a6ca20f25b962622c210f48212 100644
--- a/skia/ext/fontmgr_default_linux.cc
+++ b/skia/ext/fontmgr_default_linux.cc
@@ -13,13 +13,14 @@ namespace {
SkFontMgr* g_default_fontmgr;
} // namespace
-void SetDefaultSkiaFactory(SkFontMgr* fontmgr) {
- g_default_fontmgr = fontmgr;
+void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) {
+ SkASSERT(g_default_fontmgr == nullptr);
+ g_default_fontmgr = fontmgr.release();
}
-SK_API SkFontMgr* SkFontMgr::Factory() {
+SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
if (g_default_fontmgr) {
- return SkRef(g_default_fontmgr);
+ return sk_ref_sp(g_default_fontmgr);
}
sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr;
« no previous file with comments | « skia/ext/fontmgr_default_linux.h ('k') | skia/ext/fontmgr_default_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698