Port uses of SkLazyPtr to SkOncePtr.

include/private/SkOncePtr.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkOncePtr_DEFINED
 #define SkOncePtr_DEFINED
 
 #include "SkAtomics.h"
+#include "SkUniquePtr.h"
 
 template <typename T> class SkStaticOnce;
 
 // Use this to create a global static pointer that's intialized exactly once when you call get().
 #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 {
         return fOnce.get(f);
     }
 
     operator T*() const {
         return (T*)fOnce;
     }
 
 private:
     SkStaticOnce<T> fOnce;

[herb_g, 2015/09/08 20:24:34]

Ok. So as things evolve, I don't think that name SkStaticOnce makes sense
because it does not mean static storage scope. Maybe SkBaseOncePtr?

[mtklein_C, 2015/09/08 20:37:17]

Done, agreed.

 };
 
 /* TODO(mtklein): in next CL
 typedef SkStaticOnce<void> SkOnceFlag;
 #define SK_DECLARE_STATIC_ONCE(name) namespace {} static SkOnceFlag name
 
 template <typename F>
 inline void SkOnce(SkOnceFlag* once, const F& f) {
     once->get([&]{ f(); return (void*)2; });
 }
@@ skipping 43 matching lines @@
     }
 
 private:
     // fState == 0 --> we have not created our ptr yet
     // fState == 1 --> someone is in the middle of creating our ptr
     // else        --> (T*)fState is our ptr
     mutable SkAtomic<uintptr_t> fState;
 };
 
 #endif//SkOncePtr_DEFINED