Refactor read and write buffers.

src/core/SkPathHeap.cpp

Index: src/core/SkPathHeap.cpp
diff --git a/src/core/SkPathHeap.cpp b/src/core/SkPathHeap.cpp
index c6e2129e9ed3df017dd93452ff7e0457233f1946..a8271e1fa2851b69185e35de3a2b4ddd3633b23d 100644
--- a/src/core/SkPathHeap.cpp
+++ b/src/core/SkPathHeap.cpp
@@ -8,7 +8,8 @@
 #include "SkPathHeap.h"
 #include "SkPath.h"
 #include "SkStream.h"
-#include "SkFlattenableBuffers.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 #include <new>
 
 #define kPathCount  64
@@ -16,7 +17,7 @@
 SkPathHeap::SkPathHeap() : fHeap(kPathCount * sizeof(SkPath)) {
 }
 
-SkPathHeap::SkPathHeap(SkFlattenableReadBuffer& buffer)
+SkPathHeap::SkPathHeap(SkReadBuffer& buffer)
             : fHeap(kPathCount * sizeof(SkPath)) {
     const int count = buffer.readInt();
 
@@ -48,7 +49,7 @@ int SkPathHeap::append(const SkPath& path) {
     return fPaths.count();
 }
 
-void SkPathHeap::flatten(SkFlattenableWriteBuffer& buffer) const {
+void SkPathHeap::flatten(SkWriteBuffer& buffer) const {
     int count = fPaths.count();
 
     buffer.writeInt(count);