diff options
| author |  reed <reed@google.com> | 2016-05-04 17:14:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-04 17:14:44 -0700 |
| commit | 7eb33da7eede34c050b865dbb1b60c3dcea7191b (patch) | |
| tree | d17a15c24a12d6c805ef04c938016c3e1a59f864 /src/core/SkData.cpp | |
| parent | 086eea93b1f8253420c233c33cdabc0e74b08091 (diff) | |
Revert of SkOncePtr -> SkOnce (patchset #4 id:60001 of https://codereview.chromium.org/1953533002/ )
Reason for revert:
broken the Mac and Linux builders, e.g.:
https://build.chromium.org/p/chromium/builders/Mac/builds/15151
https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/19052
Original issue's description:
> 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
TBR=herb@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/1945293004
Diffstat (limited to 'src/core/SkData.cpp')
| -rw-r--r-- | src/core/SkData.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp index ea2da3dae4..995a30a542 100644 --- a/src/core/SkData.cpp +++ b/src/core/SkData.cpp @@ -7,7 +7,7 @@ #include "SkData.h" #include "SkOSFile.h" -#include "SkOnce.h" +#include "SkOncePtr.h" #include "SkReadBuffer.h" #include "SkStream.h" #include "SkWriteBuffer.h" @@ -80,12 +80,10 @@ sk_sp<SkData> SkData::PrivateNewWithCopy(const void* srcOrNull, size_t length) { /////////////////////////////////////////////////////////////////////////////// +SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty); sk_sp<SkData> SkData::MakeEmpty() { - static SkOnce once; - static SkData* empty; - - once([]{ empty = new SkData(nullptr, 0, nullptr, nullptr); }); - return sk_ref_sp(empty); + SkData* data = SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); })); + return sk_sp<SkData>(data); } // assumes fPtr was allocated via sk_malloc |