Refactor read and write buffers.

include/core/SkAnnotation.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkAnnotation_DEFINED
 #define SkAnnotation_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkString.h"
 
 class SkData;
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
 class SkStream;
 class SkWStream;
 struct SkPoint;
 
 /**
  *  Experimental class for annotating draws. Do not use directly yet.
  *  Use helper functions at the bottom of this file for now.
  */
 class SkAnnotation : public SkRefCnt {
 public:
     SkAnnotation(const char key[], SkData* value);
     virtual ~SkAnnotation();
 
     /**
      *  Return the data for the specified key, or NULL.
      */
     SkData* find(const char key[]) const;
 
-    SkAnnotation(SkFlattenableReadBuffer&);
-    void writeToBuffer(SkFlattenableWriteBuffer&) const;
+    SkAnnotation(SkReadBuffer&);
+    void writeToBuffer(SkWriteBuffer&) const;
 
 private:
     SkString    fKey;
     SkData*     fData;
 
     typedef SkRefCnt INHERITED;
 };
 
 /**
  *  Experimental collection of predefined Keys into the Annotation dictionary
@@ skipping 58 matching lines @@
  *
  *  If the backend of this canvas does not support annotations, this call is
  *  safely ignored.
  *
  *  The caller is responsible for managing its ownership of the SkData.
  */
 SK_API void SkAnnotateLinkToDestination(SkCanvas*, const SkRect&, SkData*);
 
 
 #endif