Port uses of SkLazyPtr to SkOncePtr.

This gives SkOncePtr a non-trivial destructor that uses std::default_delete
by default.  This is overrideable, as seen in SkColorTable.

SK_DECLARE_STATIC_ONCE_PTR still just leaves its pointers hanging at EOP.

BUG=skia:

No public API changes.
TBR=reed@google.com

Committed: https://skia.googlesource.com/skia/+/a1254acdb344174e761f5061c820559dab64a74c

Review URL: https://codereview.chromium.org/1322933005

1 files changed, 4 insertions, 9 deletions

diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 32562946ed..ffb1f836d8 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -11,9 +11,9 @@
 #include "SkBitmapDevice.h"
 #include "SkChecksum.h"
 #include "SkDevice.h"
-#include "SkLazyPtr.h"
 #include "SkMatrixImageFilter.h"
 #include "SkMutex.h"
+#include "SkOncePtr.h"
 #include "SkReadBuffer.h"
 #include "SkRect.h"
 #include "SkTDynamicHash.h"
@@ -560,24 +560,19 @@ private:
     mutable SkMutex                    fMutex;
 };
 
-SkImageFilter::Cache* CreateCache() {
-    return SkImageFilter::Cache::Create(kDefaultCacheSize);
-}
-
 } // namespace
 
 SkImageFilter::Cache* SkImageFilter::Cache::Create(size_t maxBytes) {
     return new CacheImpl(maxBytes);
 }
 
-SK_DECLARE_STATIC_LAZY_PTR(SkImageFilter::Cache, cache, CreateCache);
-
+SK_DECLARE_STATIC_ONCE_PTR(SkImageFilter::Cache, cache);
 SkImageFilter::Cache* SkImageFilter::Cache::Get() {
-    return cache.get();
+    return cache.get([]{ return SkImageFilter::Cache::Create(kDefaultCacheSize); });
 }
 
 void SkImageFilter::PurgeCache() {
-    cache.get()->purge();
+    Cache::Get()->purge();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////