diff options
| author |  mtklein <mtklein@chromium.org> | 2015-09-09 09:09:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-09 09:09:53 -0700 |
| commit | 6c59d80858f453a426df9b07fdf3a8cc01e0b906 (patch) | |
| tree | 1fc4c3c03062744c4382a40e608bdb147bebad09 /src/core/SkData.cpp | |
| parent | 336cda3fc0e01cd80212e0ac133d65b60824868e (diff) | |
Port uses of SkLazyPtr to SkOncePtr.
This gives SkOncePtr a non-trivial destructor that uses std::default_delete
by default. This is overrideable, as seen in SkColorTable.
SK_DECLARE_STATIC_ONCE_PTR still just leaves its pointers hanging at EOP.
BUG=skia:
No public API changes.
TBR=reed@google.com
Committed: https://skia.googlesource.com/skia/+/a1254acdb344174e761f5061c820559dab64a74c
Review URL: https://codereview.chromium.org/1322933005
Diffstat (limited to 'src/core/SkData.cpp')
| -rw-r--r-- | src/core/SkData.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp index 9e65d2a32e..017c397bbf 100644 --- a/src/core/SkData.cpp +++ b/src/core/SkData.cpp @@ -6,8 +6,8 @@ */ #include "SkData.h" -#include "SkLazyPtr.h" #include "SkOSFile.h" +#include "SkOncePtr.h" #include "SkReadBuffer.h" #include "SkStream.h" #include "SkWriteBuffer.h" @@ -80,14 +80,9 @@ SkData* SkData::PrivateNewWithCopy(const void* srcOrNull, size_t length) { /////////////////////////////////////////////////////////////////////////////// -// As a template argument these must have external linkage. -SkData* sk_new_empty_data() { return new SkData(nullptr, 0, nullptr, nullptr); } -namespace { void sk_unref_data(SkData* ptr) { return SkSafeUnref(ptr); } } - -SK_DECLARE_STATIC_LAZY_PTR(SkData, empty, sk_new_empty_data, sk_unref_data); - +SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty); SkData* SkData::NewEmpty() { - return SkRef(empty.get()); + return SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); })); } // assumes fPtr was allocated via sk_malloc |