Remove SkColorTable from SkFlattenable hierarchy.

src/core/SkMallocPixelRef.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkMallocPixelRef.h"
 #include "SkBitmap.h"
 #include "SkFlattenableBuffers.h"
@@ skipping 28 matching lines @@
 void SkMallocPixelRef::onUnlockPixels() {
     // nothing to do
 }
 
 void SkMallocPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
 
     buffer.writeByteArray(fStorage, fSize);
     buffer.writeBool(fCTable != NULL);
     if (fCTable) {
-        buffer.writeFlattenable(fCTable);
+        fCTable->writeToBuffer(buffer);
     }
 }
 
 SkMallocPixelRef::SkMallocPixelRef(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer, NULL) {
     fSize = buffer.getArrayCount();
     fStorage = sk_malloc_throw(fSize);
     buffer.readByteArray(fStorage);
     if (buffer.readBool()) {
-        fCTable = buffer.readFlattenableT<SkColorTable>();
+        fCTable = SkNEW_ARGS(SkColorTable, (buffer));
     } else {
         fCTable = NULL;
     }
     fOwnPixels = true;
 
     this->setPreLocked(fStorage, fCTable);
 }