Index: src/fonts/SkRemotableFontMgr.cpp |
diff --git a/src/fonts/SkRemotableFontMgr.cpp b/src/fonts/SkRemotableFontMgr.cpp |
index aca8a0b193ff62f1cf9ae763580cc8e78dc142f9..41e3bc3235b67b1756e333bb8988c36bc58f3f0f 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 @@ |
*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; })); |
} |