commit 0a232e1270620daf5ef9677026ee70875fc36883
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 28 12:08:52 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 28 12:08:52 2013 +0000
tree 9ae64375e35d9e8556f6478445a1887616aed10a
parent 23dee68a6133f52968fc562f97c272d4da21b1f7

Reverting r11968 (Enabling validation code in serialization and adding serialization to fuzzer - https://codereview.chromium.org/44573002) due to failure on Chromium AllQuads test.




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

core/SkFlattenableSerialization.cpp

diff --git a/core/SkFlattenableSerialization.cpp b/core/SkFlattenableSerialization.cpp
index b98d935..c687074 100644
--- a/core/SkFlattenableSerialization.cpp
+++ b/core/SkFlattenableSerialization.cpp
@@ -8,12 +8,14 @@
 #include "SkFlattenableSerialization.h"
 
 #include "SkData.h"
-#include "SkValidatingReadBuffer.h"
+#include "SkFlattenable.h"
+#include "SkImageFilter.h"
+#include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 
-SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) {
+SkData* SkSerializeFlattenable(SkFlattenable* flattenable) {
     SkOrderedWriteBuffer writer(1024);
-    writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag);
+    writer.setFlags(SkOrderedWriteBuffer::kCrossProcess_Flag);
     writer.writeFlattenable(flattenable);
     uint32_t size = writer.bytesWritten();
     void* data = sk_malloc_throw(size);
@@ -21,8 +23,8 @@
     return SkData::NewFromMalloc(data, size);
 }
 
-SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size,
-                                                  SkFlattenable::Type type) {
-    SkValidatingReadBuffer buffer(data, size);
-    return buffer.readFlattenable(type);
+// TODO: this guy should be renamed to ImageFilter, or take SkFlattenable::Type as a parameter.
+SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size) {
+    SkOrderedReadBuffer buffer(data, size);
+    return buffer.readImageFilter();
 }