diff options
Diffstat (limited to 'src/fonts/SkRemotableFontMgr.cpp')
-rw-r--r-- | src/fonts/SkRemotableFontMgr.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/fonts/SkRemotableFontMgr.cpp b/src/fonts/SkRemotableFontMgr.cpp index aca8a0b193..41e3bc3235 100644 --- a/src/fonts/SkRemotableFontMgr.cpp +++ b/src/fonts/SkRemotableFontMgr.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "SkOnce.h" +#include "SkOncePtr.h" #include "SkRemotableFontMgr.h" SkRemotableFontIdentitySet::SkRemotableFontIdentitySet(int count, SkFontIdentity** data) @@ -15,9 +15,7 @@ SkRemotableFontIdentitySet::SkRemotableFontIdentitySet(int count, SkFontIdentity *data = fData; } +SK_DECLARE_STATIC_ONCE_PTR(SkRemotableFontIdentitySet, empty); SkRemotableFontIdentitySet* SkRemotableFontIdentitySet::NewEmpty() { - static SkOnce once; - static SkRemotableFontIdentitySet* empty; - once([]{ empty = new SkRemotableFontIdentitySet; }); - return SkRef(empty); + return SkRef(empty.get([]{ return new SkRemotableFontIdentitySet; })); } |