Decouple the SkFlattenable from SkReader32/SkWriter32.

The current impl for SkFlattenable read/write buffers is 
that they extend from SkReader32 and SkWriter32, but that
dependency must be abstract if we are to add any other
serialization format.
Review URL: https://codereview.appspot.com/5999045

git-svn-id: http://skia.googlecode.com/svn/trunk@3654 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 20760ac6eb..6bfd9f26a2 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -10,9 +10,11 @@
 #include "SkColorFilter.h"
 #include "SkRandom.h"
 #include "SkXfermode.h"
+#include "SkOrderedReadBuffer.h"
+#include "SkOrderedWriteBuffer.h"
 
 static SkFlattenable* reincarnate_flattenable(SkFlattenable* obj) {
-    SkFlattenableWriteBuffer wb(1024);
+    SkOrderedWriteBuffer wb(1024);
     wb.writeFlattenable(obj);
 
     size_t size = wb.size();
@@ -20,7 +22,7 @@ static SkFlattenable* reincarnate_flattenable(SkFlattenable* obj) {
     // make a copy into storage
     wb.flatten(storage.get());
 
-    SkFlattenableReadBuffer rb(storage.get(), size);
+    SkOrderedReadBuffer rb(storage.get(), size);
     return rb.readFlattenable();
 }