Port uses of SkLazyPtr to 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"
@@ skipping 29 matching lines @@
     SkASSERT(colors);
 }
 
 SkColorTable::~SkColorTable() {
     sk_free(fColors);
     // f16BitCache frees itself
 }
 
 #include "SkColorPriv.h"
 
-namespace {
-struct Build16BitCache {
-    const SkPMColor* fColors;
-    int fCount;
+void SkColorTable::Free16BitCache::operator()(uint16_t* cache) const { sk_free(cache); }
 
-    uint16_t* operator()() const {
+const uint16_t* SkColorTable::read16BitCache() const {
+    return f16BitCache.get([&]{
         uint16_t* cache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
         for (int i = 0; i < fCount; i++) {
             cache[i] = SkPixel32ToPixel16_ToU16(fColors[i]);
         }
         return cache;
-    }
-};
-}//namespace
-
-void SkColorTable::Free16BitCache(uint16_t* cache) { sk_free(cache); }
-
-const uint16_t* SkColorTable::read16BitCache() const {
-    const Build16BitCache create = { fColors, fCount };
-    return f16BitCache.get(create);
+    });
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #if 0
 SkColorTable::SkColorTable(SkReadBuffer& buffer) {
     if (buffer.isVersionLT(SkReadBuffer::kRemoveColorTableAlpha_Version)) {
         /*fAlphaType = */buffer.readUInt();
     }
 
@@ skipping 35 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.detach(), count, kAllocatedWithMalloc);
 }