Refactor read and write buffers.

include/core/SkPaint.h

 
 
 /*
  * Copyright 2006 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 SkPaint_DEFINED
 #define SkPaint_DEFINED
 
 #include "SkColor.h"
 #include "SkDrawLooper.h"
 #include "SkMatrix.h"
 #include "SkXfermode.h"
 #ifdef SK_BUILD_FOR_ANDROID
 #include "SkPaintOptionsAndroid.h"
 #endif
 
 class SkAnnotation;
 class SkAutoGlyphCache;
 class SkColorFilter;
 class SkDescriptor;
 struct SkDeviceProperties;
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
 struct SkGlyph;
 struct SkRect;
 class SkGlyphCache;
 class SkImageFilter;
 class SkMaskFilter;
 class SkPath;
 class SkPathEffect;
 struct SkPoint;
 class SkRasterizer;
 class SkShader;
@@ skipping 26 matching lines @@
     SkPaint(const SkPaint& paint);
     ~SkPaint();
 
     SkPaint& operator=(const SkPaint&);
 
     SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
     friend bool operator!=(const SkPaint& a, const SkPaint& b) {
         return !(a == b);
     }
 
-    void flatten(SkFlattenableWriteBuffer&) const;
-    void unflatten(SkFlattenableReadBuffer&);
+    void flatten(SkWriteBuffer&) const;
+    void unflatten(SkReadBuffer&);
 
     /** Restores the paint to its initial settings.
     */
     void reset();
 
     /** Specifies the level of hinting to be performed. These names are taken
         from the Gnome/Cairo names for the same. They are translated into
         Freetype concepts the same as in cairo-ft-font.c:
            kNo_Hinting     -> FT_LOAD_NO_HINTING
            kSlight_Hinting -> FT_LOAD_TARGET_LIGHT
@@ skipping 992 matching lines @@
 #ifdef SK_BUILD_FOR_ANDROID
     SkPaintOptionsAndroid fPaintOptionsAndroid;
 
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;
 #endif
 };
 
 #endif