Revert of Port uses of SkLazyPtr to SkOncePtr.

include/core/SkColorTable.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkColorTable_DEFINED
 #define SkColorTable_DEFINED
 
-#include "../private/SkOncePtr.h"
 #include "SkColor.h"
 #include "SkFlattenable.h"
 #include "SkImageInfo.h"
+#include "SkLazyPtr.h"
 
 /** \class SkColorTable
 
     SkColorTable holds an array SkPMColors (premultiplied 32-bit colors) used by
     8-bit bitmaps, where the bitmap bytes are interpreted as indices into the colortable.
 
     SkColorTable is thread-safe.
 */
 class SK_API SkColorTable : public SkRefCnt {
 public:
@@ skipping 21 matching lines @@
     /** read16BitCache() returns the array of RGB16 colors that mirror the 32bit colors.
      */
     const uint16_t* read16BitCache() const;
 
     void writeToBuffer(SkWriteBuffer&) const;
 
     // may return null
     static SkColorTable* Create(SkReadBuffer&);
 
 private:
+    static void Free16BitCache(uint16_t*);
+
     enum AllocatedWithMalloc {
         kAllocatedWithMalloc
     };
     // assumes ownership of colors (assumes it was allocated w/ malloc)
     SkColorTable(SkPMColor* colors, int count, AllocatedWithMalloc);
 
-    struct Free16BitCache { void operator()(uint16_t* cache) const { sk_free(cache); } };
-
     SkPMColor*                          fColors;
-    SkOncePtr<uint16_t, Free16BitCache> f16BitCache;
+    SkLazyPtr<uint16_t, Free16BitCache> f16BitCache;
     int                                 fCount;
 
     void init(const SkPMColor* colors, int count);
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif