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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/platform/fonts/FontCache.h

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_win.cc ('k') | third_party/WebKit/Source/platform/fonts/FontCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/fonts/FontCache.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.h b/third_party/WebKit/Source/platform/fonts/FontCache.h
index 1e0ff6a8f1aa1f5df54df51a4fa76795cd8fd7fc..8b5febdd8da341f0bc26437f107d5e8d122ceae1 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.h
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.h
@@ -114,7 +114,7 @@ class PLATFORM_EXPORT FontCache {
void invalidate();
SkFontMgr* fontManager() { return m_fontManager.get(); }
- static void setFontManager(const sk_sp<SkFontMgr>&);
+ static void setFontManager(sk_sp<SkFontMgr>);
#if !OS(MACOSX)
static const AtomicString& systemFontFamily();
@@ -246,6 +246,7 @@ class PLATFORM_EXPORT FontCache {
sk_sp<SkFontMgr> m_fontManager;
+ // A leaky owning bare pointer.
static SkFontMgr* s_staticFontManager;
#if OS(WIN)
« no previous file with comments | « skia/ext/fontmgr_default_win.cc ('k') | third_party/WebKit/Source/platform/fonts/FontCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698