| Index: skia/ext/fontmgr_default_win.cc
|
| diff --git a/skia/ext/fontmgr_default_win.cc b/skia/ext/fontmgr_default_win.cc
|
| index 6c451fab3a4642831270ed34fd97a2efed2688ca..5e480d3cefabd2437b2e64b99da84f3764803da0 100644
|
| --- a/skia/ext/fontmgr_default_win.cc
|
| +++ b/skia/ext/fontmgr_default_win.cc
|
| @@ -12,14 +12,22 @@ namespace {
|
| // This is a leaky bare owning pointer.
|
| SkFontMgr* g_default_fontmgr;
|
|
|
| +// The ppapi code currently calls SetDefaultSkiaFactory twice on Win8+.
|
| +// This tracks when the global escapes and shouldno longer be set.
|
| +SkDEBUGCODE(bool g_factory_called;)
|
| +
|
| } // namespace
|
|
|
| void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) {
|
| - SkASSERT(g_default_fontmgr == nullptr);
|
| + SkASSERT(!g_factory_called);
|
| +
|
| + SkSafeUnref(g_default_fontmgr);
|
| g_default_fontmgr = fontmgr.release();
|
| }
|
|
|
| SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
|
| + SkDEBUGCODE(g_factory_called = true;)
|
| +
|
| // This will be set when DirectWrite is in use, and an SkFontMgr has been
|
| // created with the pre-sandbox warmed up one. Otherwise, we fallback to a
|
| // GDI SkFontMgr which is used in the browser.
|
|
|