change colortable to use factory for reinflating, check for empty

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
@@ skipping 31 matching lines @@
     }
 
     /** Return the array of colors for reading.
      */
     const SkPMColor* readColors() const { return fColors; }
 
     /** read16BitCache() returns the array of RGB16 colors that mirror the 32bit colors.
      */
     const uint16_t* read16BitCache() const;
 
-    explicit SkColorTable(SkReadBuffer&);
     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);
+
     SkPMColor*                          fColors;
     SkLazyPtr<uint16_t, Free16BitCache> f16BitCache;
     int                                 fCount;
 
     void init(const SkPMColor* colors, int count);
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif