Refactor read and write buffers.

include/core/SkImageInfo.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageInfo_DEFINED
 #define SkImageInfo_DEFINED
 
 #include "SkTypes.h"
 #include "SkSize.h"
 
-class SkFlattenableWriteBuffer;
-class SkFlattenableReadBuffer;
+class SkWriteBuffer;
+class SkReadBuffer;
 
 /**
  *  Describes how to interpret the alpha compoent of a pixel.
  */
 enum SkAlphaType {
     /**
      *  All pixels should be treated as opaque, regardless of the value stored
      *  in their alpha field. Used for legacy images that wrote 0 or garbarge
      *  in their alpha field, but intended the RGB to be treated as opaque.
      */
@@ skipping 145 matching lines @@
         return fWidth * this->bytesPerPixel();
     }
 
     bool operator==(const SkImageInfo& other) const {
         return 0 == memcmp(this, &other, sizeof(other));
     }
     bool operator!=(const SkImageInfo& other) const {
         return 0 != memcmp(this, &other, sizeof(other));
     }
 
-    void unflatten(SkFlattenableReadBuffer&);
-    void flatten(SkFlattenableWriteBuffer&) const;
+    void unflatten(SkReadBuffer&);
+    void flatten(SkWriteBuffer&) const;
 
     size_t getSafeSize(size_t rowBytes) const {
         if (0 == fHeight) {
             return 0;
         }
         return (fHeight - 1) * rowBytes + fWidth * this->bytesPerPixel();
     }
 };
 
 #endif