Chromium Code Reviews| Index: content/child/font_warmup_win.cc |
| diff --git a/content/child/font_warmup_win.cc b/content/child/font_warmup_win.cc |
| index 739246ba781547d702775424b1152ffb3d02768c..99d013963c574278f4ae7b500a442fdc372f1e8d 100644 |
| --- a/content/child/font_warmup_win.cc |
| +++ b/content/child/font_warmup_win.cc |
| @@ -416,7 +416,7 @@ void PatchServiceManagerCalls() { |
| GdiFontPatchData* PatchGdiFontEnumeration(const base::FilePath& path) { |
| if (!g_warmup_fontmgr) |
|
f(malita)
2017/01/09 15:25:34
What would it take to convert g_warmup_fontmgr to
bungeman-chromium
2017/01/09 19:15:28
We've tried this before and had to revert. See htt
|
| - g_warmup_fontmgr = SkFontMgr_New_DirectWrite(); |
| + g_warmup_fontmgr = SkFontMgr_New_DirectWrite().release(); |
| DCHECK(g_warmup_fontmgr); |
| return new GdiFontPatchDataImpl(path); |
| } |
| @@ -429,8 +429,9 @@ void ResetEmulatedGdiHandlesForTesting() { |
| g_fake_gdi_object_factory.Get().ResetObjectHandles(); |
| } |
| -void SetPreSandboxWarmupFontMgrForTesting(SkFontMgr* fontmgr) { |
| - g_warmup_fontmgr = fontmgr; |
| +void SetPreSandboxWarmupFontMgrForTesting(sk_sp<SkFontMgr> fontmgr) { |
| + SkSafeUnref(g_warmup_fontmgr); |
| + g_warmup_fontmgr = fontmgr.release(); |
| } |
| } // namespace content |