Index: src/core/SkFlattenableSerialization.cpp |
diff --git a/src/core/SkFlattenableSerialization.cpp b/src/core/SkFlattenableSerialization.cpp |
index b74c82f051648f77dce5da97b26e21ba53b12e4b..63180532d981d59ecadec41a69fb35b156fed2e1 100644 |
--- a/src/core/SkFlattenableSerialization.cpp |
+++ b/src/core/SkFlattenableSerialization.cpp |
@@ -9,12 +9,12 @@ |
#include "SkData.h" |
#include "SkFlattenable.h" |
-#include "SkOrderedReadBuffer.h" |
+#include "SkValidatingReadBuffer.h" |
#include "SkOrderedWriteBuffer.h" |
-SkData* SkSerializeFlattenable(SkFlattenable* flattenable) { |
+SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) { |
SkOrderedWriteBuffer writer(1024); |
- writer.setFlags(SkOrderedWriteBuffer::kCrossProcess_Flag); |
+ writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag); |
writer.writeFlattenable(flattenable); |
uint32_t size = writer.bytesWritten(); |
void* data = sk_malloc_throw(size); |
@@ -22,7 +22,7 @@ SkData* SkSerializeFlattenable(SkFlattenable* flattenable) { |
return SkData::NewFromMalloc(data, size); |
} |
-SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size) { |
- SkOrderedReadBuffer buffer(data, size); |
- return buffer.readFlattenable(); |
+SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size) { |
mtklein
2013/09/24 22:52:18
I noticed a comment on the chromium code that hook
sugoi1
2013/09/25 21:15:27
Absolutely, that's the main reason why I have to c
|
+ SkValidatingReadBuffer reader(data, size); |
+ return reader.readFlattenable(); |
} |