Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: include/private/SkOncePtr.h

Issue 1322933005: Port uses of SkLazyPtr to SkOncePtr. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: the rest Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: include/private/SkOncePtr.h
diff --git a/include/private/SkOncePtr.h b/include/private/SkOncePtr.h
index 9af204bcb29381d97f8444165d10267ce79a460b..0904d4595e4f7595c301a21f2e90cb4ed7f02793 100644
--- a/include/private/SkOncePtr.h
+++ b/include/private/SkOncePtr.h
@@ -9,6 +9,7 @@
#define SkOncePtr_DEFINED
#include "SkAtomics.h"
+#include "SkUniquePtr.h"
template <typename T> class SkStaticOnce;
@@ -16,15 +17,15 @@ template <typename T> class SkStaticOnce;
#define SK_DECLARE_STATIC_ONCE_PTR(type, name) namespace {} static SkStaticOnce<type> name
// Use this for a local or member pointer that's initialized exactly once when you call get().
-template <typename T>
+template <typename T, typename Delete = skstd::default_delete<T>>
class SkOncePtr : SkNoncopyable {
public:
SkOncePtr() { sk_bzero(this, sizeof(*this)); }
-
- // SkOncePtr does not have a destructor and does not clean up the pointer. But you may, e.g.
- // delete (T*)fOncePtr;
- // SkSafeUnref((T*)fOncePtr);
- // etc.
+ ~SkOncePtr() {
+ if (T* ptr = (T*)*this) {
+ Delete()(ptr);
+ }
+ }
template <typename F>
T* get(const F& f) const {

Powered by Google App Engine
This is Rietveld 408576698