Refactor read and write buffers.

tests/FlatDataTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorFilter.h"
 #include "SkGradientShader.h"
 #include "SkPaint.h"
 #include "SkPictureFlat.h"
 #include "SkShader.h"
 #include "SkXfermode.h"
 #include "Test.h"
 
 struct SkFlattenableTraits {
-    static void flatten(SkOrderedWriteBuffer& buffer, const SkFlattenable& flattenable) {
+    static void flatten(SkWriteBuffer& buffer, const SkFlattenable& flattenable) {
         buffer.writeFlattenable(&flattenable);
     }
 };
 struct SkBitmapTraits {
-    static void flatten(SkOrderedWriteBuffer& buffer, const SkBitmap& bitmap) {
+    static void flatten(SkWriteBuffer& buffer, const SkBitmap& bitmap) {
         bitmap.flatten(buffer);
     }
 };
 
 class Controller : public SkChunkFlatController {
 public:
     Controller() : INHERITED(1024) {
         this->INHERITED::setNamedFactorySet(SkNEW(SkNamedFactorySet))->unref();
     }
 private:
@@ skipping 42 matching lines @@
     }
 
     // Test SkColorFilter
     SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateLightingFilter(SK_ColorBLUE, SK_ColorRED));
     testCreate<SkFlattenableTraits>(reporter, *cf);
 
     // Test SkXfermode
     SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(SkXfermode::kDstOver_Mode));
     testCreate<SkFlattenableTraits>(reporter, *xfer);
 }