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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "skia/ext/fontmgr_default_linux.h" 5 #include "skia/ext/fontmgr_default_linux.h"
6 6
7 #include "third_party/skia/include/ports/SkFontConfigInterface.h" 7 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
8 #include "third_party/skia/include/ports/SkFontMgr.h" 8 #include "third_party/skia/include/ports/SkFontMgr.h"
9 #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h" 9 #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
10 10
11 namespace { 11 namespace {
12 // This is a purposefully leaky pointer that has ownership of the FontMgr. 12 // This is a purposefully leaky pointer that has ownership of the FontMgr.
13 SkFontMgr* g_default_fontmgr; 13 SkFontMgr* g_default_fontmgr;
14 } // namespace 14 } // namespace
15 15
16 void SetDefaultSkiaFactory(SkFontMgr* fontmgr) { 16 void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) {
17 g_default_fontmgr = fontmgr; 17 SkASSERT(g_default_fontmgr == nullptr);
18 g_default_fontmgr = fontmgr.release();
18 } 19 }
19 20
20 SK_API SkFontMgr* SkFontMgr::Factory() { 21 SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
21 if (g_default_fontmgr) { 22 if (g_default_fontmgr) {
22 return SkRef(g_default_fontmgr); 23 return sk_ref_sp(g_default_fontmgr);
23 } 24 }
24 sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); 25 sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
25 return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr; 26 return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr;
26 } 27 }
OLDNEW
« 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