Refactor read and write buffers.

include/core/SkPaintOptionsAndroid.h

 
 /*
  * Copyright 2012 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 SkPaintOptionsAndroid_DEFINED
 #define SkPaintOptionsAndroid_DEFINED
 
 #include "SkTypes.h"
 #include "SkString.h"
 
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
 
 /** \class SkLanguage
 
     The SkLanguage class represents a human written language, and is used by
     text draw operations to determine which glyph to draw when drawing
     characters with variants (ie Han-derived characters).
 */
 class SkLanguage {
 public:
     SkLanguage() { }
@@ skipping 45 matching lines @@
     bool operator==(const SkPaintOptionsAndroid& b) const {
         return !(*this != b);
     }
 
     bool operator!=(const SkPaintOptionsAndroid& b) const {
         return fLanguage != b.fLanguage ||
                fFontVariant != b.fFontVariant ||
                fUseFontFallbacks != b.fUseFontFallbacks;
     }
 
-    void flatten(SkFlattenableWriteBuffer&) const;
-    void unflatten(SkFlattenableReadBuffer&);
+    void flatten(SkWriteBuffer&) const;
+    void unflatten(SkReadBuffer&);
 
     /** Return the paint's language value used for drawing text.
         @return the paint's language value used for drawing text.
     */
     const SkLanguage& getLanguage() const { return fLanguage; }
 
     /** Set the paint's language value used for drawing text.
         @param language set the paint's language value for drawing text.
     */
     void setLanguage(const SkLanguage& language) { fLanguage = language; }
@@ skipping 26 matching lines @@
         fUseFontFallbacks = useFontFallbacks;
     }
 
 private:
     SkLanguage fLanguage;
     FontVariant fFontVariant;
     bool fUseFontFallbacks;
 };
 
 #endif // #ifndef SkPaintOptionsAndroid_DEFINED