diff options
| author |  mtklein <mtklein@chromium.org> | 2016-05-04 14:40:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-04 14:40:18 -0700 |
| commit | 9bd3fc7fa9bb7cad050bd619aa93d4c48ebb5c02 (patch) | |
| tree | 34a4f19d22263c547d2a53734caf179797fb9b53 /src/core/SkFontMgr.cpp | |
| parent | f2509381bdd9e712919418f7ebe831f974208154 (diff) | |
SkOncePtr -> SkOnce
It's always nice to kill off a synchronization primitive.
And while less terse, I think this new code reads more clearly.
... and, SkOncePtr's tests were the only thing now using sk_num_cores()
outside of SkTaskGroup, so I've hidden it as static inside SkTaskGroup.cpp.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1953533002
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Review-Url: https://codereview.chromium.org/1953533002
Diffstat (limited to 'src/core/SkFontMgr.cpp')
| -rw-r--r-- | src/core/SkFontMgr.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp index ebb9a89662..0f00667926 100644 --- a/src/core/SkFontMgr.cpp +++ b/src/core/SkFontMgr.cpp @@ -7,7 +7,7 @@ #include "SkFontDescriptor.h" #include "SkFontMgr.h" -#include "SkOncePtr.h" +#include "SkOnce.h" #include "SkStream.h" #include "SkTypes.h" @@ -169,12 +169,15 @@ SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[], SkFontStyle return this->onLegacyCreateTypeface(familyName, style); } -SK_DECLARE_STATIC_ONCE_PTR(SkFontMgr, singleton); SkFontMgr* SkFontMgr::RefDefault() { - return SkRef(singleton.get([]{ + static SkOnce once; + static SkFontMgr* singleton; + + once([]{ SkFontMgr* fm = SkFontMgr::Factory(); - return fm ? fm : new SkEmptyFontMgr; - })); + singleton = fm ? fm : new SkEmptyFontMgr; + }); + return SkRef(singleton); } /** |