Refactor read and write buffers.

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"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 
 // assumes ptr was allocated via sk_malloc
 static void sk_free_releaseproc(void* ptr, void*) {
     sk_free(ptr);
 }
 
 static bool is_valid(const SkImageInfo& info, SkColorTable* ctable) {
     if (info.fWidth < 0 ||
         info.fHeight < 0 ||
         (unsigned)info.fColorType > (unsigned)kLastEnum_SkColorType ||
@@ skipping 173 matching lines @@
 }
 
 void SkMallocPixelRef::onUnlockPixels() {
     // nothing to do
 }
 
 size_t SkMallocPixelRef::getAllocatedSizeInBytes() const {
     return this->info().getSafeSize(fRB);
 }
 
-void SkMallocPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const {
+void SkMallocPixelRef::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
 
     buffer.write32(SkToU32(fRB));
 
     // TODO: replace this bulk write with a chunky one that can trim off any
     // trailing bytes on each scanline (in case rowbytes > width*size)
     size_t size = this->info().getSafeSize(fRB);
     buffer.writeByteArray(fStorage, size);
     buffer.writeBool(fCTable != NULL);
     if (fCTable) {
         fCTable->writeToBuffer(buffer);
     }
 }
 
-SkMallocPixelRef::SkMallocPixelRef(SkFlattenableReadBuffer& buffer)
+SkMallocPixelRef::SkMallocPixelRef(SkReadBuffer& buffer)
     : INHERITED(buffer, NULL)
     , fReleaseProc(sk_free_releaseproc)
     , fReleaseProcContext(NULL)
 {
     fRB = buffer.read32();
     size_t size = buffer.isValid() ? this->info().getSafeSize(fRB) : 0;
     if (buffer.validateAvailable(size)) {
         fStorage = sk_malloc_throw(size);
         buffer.readByteArray(fStorage, size);
     } else {
         fStorage = NULL;
     }
 
     if (buffer.readBool()) {
         fCTable = SkNEW_ARGS(SkColorTable, (buffer));
     } else {
         fCTable = NULL;
     }
 
     this->setPreLocked(fStorage, fRB, fCTable);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info,
                                                 SkColorTable* ctable) {
     return SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), ctable);
 }