diff options
| author |  mtklein <mtklein@chromium.org> | 2016-05-05 16:05:56 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-05 16:05:56 -0700 |
| commit | ffa4a9213b4e754adc210fa02a3c4b1ae8d3b6d0 (patch) | |
| tree | e6f20243b4ed7c36e36302d914e255dfa6799217 /src/core/SkData.cpp | |
| parent | 4017007b288087c07c596baa9fe8ecf485bca1c3 (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
Committed: https://skia.googlesource.com/skia/+/9bd3fc7fa9bb7cad050bd619aa93d4c48ebb5c02
Review-Url: https://codereview.chromium.org/1953533002
Diffstat (limited to 'src/core/SkData.cpp')
| -rw-r--r-- | src/core/SkData.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp index 995a30a542..ea2da3dae4 100644 --- a/src/core/SkData.cpp +++ b/src/core/SkData.cpp @@ -7,7 +7,7 @@ #include "SkData.h" #include "SkOSFile.h" -#include "SkOncePtr.h" +#include "SkOnce.h" #include "SkReadBuffer.h" #include "SkStream.h" #include "SkWriteBuffer.h" @@ -80,10 +80,12 @@ sk_sp<SkData> SkData::PrivateNewWithCopy(const void* srcOrNull, size_t length) { /////////////////////////////////////////////////////////////////////////////// -SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty); sk_sp<SkData> SkData::MakeEmpty() { - SkData* data = SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); })); - return sk_sp<SkData>(data); + static SkOnce once; + static SkData* empty; + + once([]{ empty = new SkData(nullptr, 0, nullptr, nullptr); }); + return sk_ref_sp(empty); } // assumes fPtr was allocated via sk_malloc |