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

Unified Diff: include/core/SkRefCnt.h

Issue 1436033003: skstd -> std for unique_ptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: more functions Created 4 years, 11 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
« no previous file with comments | « gyp/core.gypi ('k') | include/private/SkOncePtr.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkRefCnt.h
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 9d1e5f1f02c252c13c2091208903457403c0a825..1779278c6f889b920d81158266baaf970def088c 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -9,8 +9,8 @@
#define SkRefCnt_DEFINED
#include "../private/SkAtomics.h"
-#include "../private/SkUniquePtr.h"
#include "SkTypes.h"
+#include <memory>
/** \class SkRefCntBase
@@ -185,12 +185,22 @@ template <typename T> struct SkTUnref {
/**
* Utility class that simply unref's its argument in the destructor.
*/
-template <typename T> class SkAutoTUnref : public skstd::unique_ptr<T, SkTUnref<T>> {
+template <typename T> class SkAutoTUnref {
public:
- explicit SkAutoTUnref(T* obj = nullptr) : skstd::unique_ptr<T, SkTUnref<T>>(obj) {}
+ explicit SkAutoTUnref(T* obj = nullptr) : fPtr(obj) {}
- T* detach() { return this->release(); }
- operator T*() const { return this->get(); }
+ void swap(SkAutoTUnref& other) { fPtr.swap(other.fPtr); }
+
+ T* get() const { return fPtr.get(); }
+ operator T* () const { return fPtr.get(); }
+ T* operator->() const { return fPtr.get(); }
+
+ void reset(T* ptr = nullptr) { fPtr.reset(ptr); }
+ T* detach() { return fPtr.release(); }
+ T* release() { return fPtr.release(); }
+
+private:
+ std::unique_ptr<T, SkTUnref<T>> fPtr;
};
// Can't use the #define trick below to guard a bare SkAutoTUnref(...) because it's templated. :(
« no previous file with comments | « gyp/core.gypi ('k') | include/private/SkOncePtr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698