remove non-static uses of SkOncePtr

src/core/SkColorTable.cpp

 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkColorTable.h"
 #include "SkReadBuffer.h"
@@ skipping 23 matching lines @@
 SkColorTable::SkColorTable(SkPMColor* colors, int count, AllocatedWithMalloc)
     : fColors(colors)
     , fCount(count)
 {
     SkASSERT(count > 0 && count <= 256);
     SkASSERT(colors);
 }
 
 SkColorTable::~SkColorTable() {
     sk_free(fColors);
-    // f16BitCache frees itself
+    sk_free(f16BitCache);
 }
 
 #include "SkColorPriv.h"
 
 const uint16_t* SkColorTable::read16BitCache() const {
-    return f16BitCache.get([&]{
-        auto cache = new uint16_t[fCount];
+    f16BitCacheOnce([this] {
+        f16BitCache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
         for (int i = 0; i < fCount; i++) {
-            cache[i] = SkPixel32ToPixel16_ToU16(fColors[i]);
+            f16BitCache[i] = SkPixel32ToPixel16_ToU16(fColors[i]);
         }
-        return cache;
     });
+    return f16BitCache;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #if 0
 SkColorTable::SkColorTable(SkReadBuffer& buffer) {
     if (buffer.isVersionLT(SkReadBuffer::kRemoveColorTableAlpha_Version)) {
         /*fAlphaType = */buffer.readUInt();
     }
 
@@ skipping 34 matching lines @@
     }
 
     const size_t allocSize = count * sizeof(SkPMColor);
     SkAutoTDelete<SkPMColor> colors((SkPMColor*)sk_malloc_throw(allocSize));
     if (!buffer.readColorArray(colors, count)) {
         return nullptr;
     }
 
     return new SkColorTable(colors.release(), count, kAllocatedWithMalloc);
 }