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

Side by Side Diff: ui/gfx/hud_font.cc

Issue 2011713003: Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 6 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 | « ui/gfx/hud_font.h ('k') | ui/gfx/skia_util.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/gfx/hud_font.h" 5 #include "ui/gfx/hud_font.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "third_party/skia/include/core/SkTypeface.h" 8 #include "third_party/skia/include/core/SkTypeface.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 namespace { 12 namespace {
13 base::LazyInstance<skia::RefPtr<SkTypeface>> g_hud_typeface; 13 base::LazyInstance<sk_sp<SkTypeface>> g_hud_typeface;
14 } // namespace 14 } // namespace
15 15
16 void SetHudTypeface(skia::RefPtr<SkTypeface> typeface) { 16 void SetHudTypeface(sk_sp<SkTypeface> typeface) {
17 g_hud_typeface.Get() = typeface; 17 g_hud_typeface.Get() = typeface;
18 } 18 }
19 19
20 skia::RefPtr<SkTypeface> GetHudTypeface() { 20 sk_sp<SkTypeface> GetHudTypeface() {
21 // nullptr is fine; caller will create its own in that case. 21 // nullptr is fine; caller will create its own in that case.
22 return g_hud_typeface.Get(); 22 return g_hud_typeface.Get();
23 } 23 }
24 24
25 } // namespace gfx 25 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/hud_font.h ('k') | ui/gfx/skia_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698