SkLazyPtr suitable as a local or class member.

src/core/SkLazyPtr.h

Index: src/core/SkLazyPtr.h
diff --git a/src/core/SkLazyPtr.h b/src/core/SkLazyPtr.h
index 594112f6aca367af95580c9d619b22690728def3..f9508c5973db4b9b3f7f5e1a146c3a1f1c780612 100644
--- a/src/core/SkLazyPtr.h
+++ b/src/core/SkLazyPtr.h
@@ -8,7 +8,7 @@
 #ifndef SkLazyPtr_DEFINED
 #define SkLazyPtr_DEFINED
 
-/** Declare a lazily-chosen static pointer (or array of pointers) of type F.
+/** Declare a lazily-chosen static pointer (or array of pointers) of type T.
  *
  *  Example usage:
  *
@@ -49,7 +49,7 @@
  */
 
 #define SK_DECLARE_STATIC_LAZY_PTR(T, name, ...) \
-    namespace {} static Private::SkLazyPtr<T, ##__VA_ARGS__> name
+    namespace {} static Private::SkLazyPtrBase<T, ##__VA_ARGS__> name
 
 #define SK_DECLARE_STATIC_LAZY_PTR_ARRAY(T, name, N, ...) \
     namespace {} static Private::SkLazyPtrArray<T, N, ##__VA_ARGS__> name
@@ -58,7 +58,6 @@
 // problems with them in function-local statics because it uses -fno-threadsafe-statics, and even
 // in builds with threadsafe statics, those threadsafe statics are just unnecessary overhead.
 
-
 // Everything below here is private implementation details.  Don't touch, don't even look.
 
 #include "SkDynamicAnnotations.h"
@@ -103,7 +102,7 @@ template <typename T> void sk_delete(T* ptr) { SkDELETE(ptr); }
 
 // This has no constructor and must be zero-initalized (the macro above does this).
 template <typename T, T* (*Create)() = sk_new<T>, void (*Destroy)(T*) = sk_delete<T> >
-class SkLazyPtr {
+class SkLazyPtrBase {
 public:
     T* get() {
         // If fPtr has already been filled, we need a consume barrier when loading it.
@@ -112,7 +111,7 @@ public:
         return ptr ? ptr : try_cas<T*, Destroy>(&fPtr, Create());
     }
 
-private:
+protected:
     void* fPtr;
 };
 
@@ -136,4 +135,18 @@ private:
 
 }  // namespace Private
 
+// This version is suitable for use as a class member.
+// It's the same as above except it has a constructor to zero itself and a destructor to clean up.
+template <typename T,
+          T* (*Create)() = Private::sk_new<T>,
+          void (*Destroy)(T*) = Private::sk_delete<T> >
+class SkLazyPtr : public Private::SkLazyPtrBase<T, Create, Destroy> {
+public:
+    SkLazyPtr() { INHERITED::fPtr = NULL; }
+    ~SkLazyPtr() { if (INHERITED::fPtr) { Destroy((T*)INHERITED::fPtr); } }
+private:
+    typedef Private::SkLazyPtrBase<T, Create, Destroy> INHERITED;
+};
+
+
 #endif//SkLazyPtr_DEFINED