Remove SkColorTable from SkFlattenable hierarchy.

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 "SkAlpha.h"
 #include "SkColor.h"
 #include "SkFlattenable.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.
 */
-class SkColorTable : public SkFlattenable {
+class SkColorTable : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkColorTable)
 
     /** Makes a deep copy of colors.
      */
     SkColorTable(const SkColorTable& src);
     SkColorTable(const SkPMColor colors[], int count,
                  SkAlphaType alphaType = kPremul_SkAlphaType);
     virtual ~SkColorTable();
 
@@ skipping 35 matching lines @@
         Also, unlike lockColors(), the returned array here cannot be modified.
     */
     const uint16_t* lock16BitCache();
     /** Balancing call to lock16BitCache().
     */
     void unlock16BitCache() {
         SkASSERT(f16BitCacheLockCount > 0);
         SkDEBUGCODE(f16BitCacheLockCount -= 1);
     }
 
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorTable)
-
-protected:
     explicit SkColorTable(SkFlattenableReadBuffer&);
-    void flatten(SkFlattenableWriteBuffer&) const;
+    void writeToBuffer(SkFlattenableWriteBuffer&) const;
 
 private:
     SkPMColor*  fColors;
     uint16_t*   f16BitCache;
     uint16_t    fCount;
     uint8_t     fAlphaType;
     SkDEBUGCODE(int fColorLockCount;)
     SkDEBUGCODE(int f16BitCacheLockCount;)
 
     void inval16BitCache();
 
-    typedef SkFlattenable INHERITED;
+    typedef SkRefCnt INHERITED;
 };
 
 #endif