Refactor read and write buffers.

include/images/SkImageRef.h

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkImageRef_DEFINED
@@ skipping 58 matching lines @@
                           SkBitmap::Config, SkImageDecoder::Mode);
 
     /*  Overrides from SkPixelRef
         When these are called, we will have already acquired the mutex!
      */
 
     virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
     // override this in your subclass to clean up when we're unlocking pixels
     virtual void onUnlockPixels() SK_OVERRIDE {}
 
-    SkImageRef(SkFlattenableReadBuffer&, SkBaseMutex* mutex = NULL);
-    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+    SkImageRef(SkReadBuffer&, SkBaseMutex* mutex = NULL);
+    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
     SkBitmap fBitmap;
 
 private:
     SkStreamRewindable* setStream(SkStreamRewindable*);
     // called with mutex already held. returns true if the bitmap is in the
     // requested state (or further, i.e. has pixels)
     bool prepareBitmap(SkImageDecoder::Mode);
 
     SkImageDecoderFactory*  fFactory;    // may be null
     SkStreamRewindable*     fStream;
     int                     fSampleSize;
     bool                    fDoDither;
     bool                    fErrorInDecoding;
 
     friend class SkImageRefPool;
 
     SkImageRef*  fPrev, *fNext;
     size_t ramUsed() const;
 
     typedef SkPixelRef INHERITED;
 };
 
 #endif