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

Side by Side Diff: skia/ext/fontmgr_default_android.cc

Issue 2644103003: Allow multiple calls to SetDefaultSkiaFactory on Windows. (Closed)
Patch Set: 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 | « no previous file | skia/ext/fontmgr_default_win.cc » ('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_android.h" 5 #include "skia/ext/fontmgr_default_android.h"
6 6
7 #include "third_party/skia/include/ports/SkFontMgr.h" 7 #include "third_party/skia/include/ports/SkFontMgr.h"
8 #include "third_party/skia/include/ports/SkFontMgr_android.h" 8 #include "third_party/skia/include/ports/SkFontMgr_android.h"
9 9
10 namespace { 10 namespace {
11 // An owning leaky bare pointer. 11 // An owning leaky bare pointer.
12 SkFontMgr* g_default_fontmgr; 12 SkFontMgr* g_default_fontmgr;
13 } // namespace 13 } // namespace
14 14
15 SK_API void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) { 15 SK_API void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) {
16 SkASSERT(g_default_fontmgr == nullptr);
16 g_default_fontmgr = fontmgr.release(); 17 g_default_fontmgr = fontmgr.release();
17 } 18 }
18 19
19 SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() { 20 SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
20 return g_default_fontmgr ? sk_ref_sp(g_default_fontmgr) 21 return g_default_fontmgr ? sk_ref_sp(g_default_fontmgr)
21 : SkFontMgr_New_Android(nullptr); 22 : SkFontMgr_New_Android(nullptr);
22 } 23 }
OLDNEW
« no previous file with comments | « no previous file | skia/ext/fontmgr_default_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698