| Index: include/core/SkPaint.h | 
| diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h | 
| index 00ec29e42ec066dda46d3a22e99c95240094eaf8..abb859950c5bb6a66aecccded690ca8cd6ae02a2 100644 | 
| --- a/include/core/SkPaint.h | 
| +++ b/include/core/SkPaint.h | 
| @@ -24,8 +24,8 @@ class SkAutoGlyphCache; | 
| class SkColorFilter; | 
| class SkDescriptor; | 
| struct SkDeviceProperties; | 
| -class SkFlattenableReadBuffer; | 
| -class SkFlattenableWriteBuffer; | 
| +class SkReadBuffer; | 
| +class SkWriteBuffer; | 
| struct SkGlyph; | 
| struct SkRect; | 
| class SkGlyphCache; | 
| @@ -72,8 +72,8 @@ public: | 
| return !(a == b); | 
| } | 
|  | 
| -    void flatten(SkFlattenableWriteBuffer&) const; | 
| -    void unflatten(SkFlattenableReadBuffer&); | 
| +    void flatten(SkWriteBuffer&) const; | 
| +    void unflatten(SkReadBuffer&); | 
|  | 
| /** Restores the paint to its initial settings. | 
| */ | 
|  |