remove non-static uses of 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 "../private/SkAtomics.h"
 #include <memory>
 
-template <typename T> class SkBaseOncePtr;
-
 // 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 SkBaseOncePtr<type> name;
 
-// Use this for a local or member pointer that's initialized exactly once when you call get().
-template <typename T, typename Delete = std::default_delete<T>>
-class SkOncePtr : SkNoncopyable {
-public:
-    SkOncePtr() { sk_bzero(this, sizeof(*this)); }
-    ~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:
-    SkBaseOncePtr<T> fOnce;
-};
-
-// If you ask for SkOncePtr<T[]>, we'll clean up with delete[] by default.
-template <typename T>
-class SkOncePtr<T[]> : public SkOncePtr<T, std::default_delete<T[]>> {};
-
-/* TODO(mtklein): in next CL
-typedef SkBaseOncePtr<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; });
-}
-*/
-
-// Implementation details below here!  No peeking!
-
 template <typename T>
 class SkBaseOncePtr {
 public:
     template <typename F>
     T* get(const F& f) const {
         uintptr_t state = sk_atomic_load(&fState, sk_memory_order_acquire);
         if (state < 2) {
             if (state == 0) {
                 // It looks like no one has tried to create our pointer yet.
                 // We try to claim that task by atomically swapping our state from '0' to '1'.
@@ skipping 29 matching lines @@
         // TODO: If state == 1 spin until it's not?
     }
 
     // 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 uintptr_t fState;
 };
 
 #endif//SkOncePtr_DEFINED