Refactor read and write buffers.

src/core/SkPathHeap.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkPathHeap.h"
 #include "SkPath.h"
 #include "SkStream.h"
-#include "SkFlattenableBuffers.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 #include <new>
 
 #define kPathCount  64
 
 SkPathHeap::SkPathHeap() : fHeap(kPathCount * sizeof(SkPath)) {
 }
 
-SkPathHeap::SkPathHeap(SkFlattenableReadBuffer& buffer)
+SkPathHeap::SkPathHeap(SkReadBuffer& buffer)
             : fHeap(kPathCount * sizeof(SkPath)) {
     const int count = buffer.readInt();
 
     fPaths.setCount(count);
     SkPath** ptr = fPaths.begin();
     SkPath* p = (SkPath*)fHeap.allocThrow(count * sizeof(SkPath));
 
     for (int i = 0; i < count; i++) {
         new (p) SkPath;
         buffer.readPath(p);
@@ skipping 11 matching lines @@
     }
 }
 
 int SkPathHeap::append(const SkPath& path) {
     SkPath* p = (SkPath*)fHeap.allocThrow(sizeof(SkPath));
     new (p) SkPath(path);
     *fPaths.append() = p;
     return fPaths.count();
 }
 
-void SkPathHeap::flatten(SkFlattenableWriteBuffer& buffer) const {
+void SkPathHeap::flatten(SkWriteBuffer& buffer) const {
     int count = fPaths.count();
 
     buffer.writeInt(count);
     SkPath* const* iter = fPaths.begin();
     SkPath* const* stop = fPaths.end();
     while (iter < stop) {
         buffer.writePath(**iter);
         iter++;
     }
 }