| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkFlattenableSerialization.h" | 8 #include "SkFlattenableSerialization.h" |
| 9 | 9 |
| 10 #include "SkData.h" | 10 #include "SkData.h" |
| 11 #include "SkFlattenable.h" | 11 #include "SkValidatingReadBuffer.h" |
| 12 #include "SkImageFilter.h" | |
| 13 #include "SkOrderedReadBuffer.h" | |
| 14 #include "SkOrderedWriteBuffer.h" | 12 #include "SkOrderedWriteBuffer.h" |
| 15 | 13 |
| 16 SkData* SkSerializeFlattenable(SkFlattenable* flattenable) { | 14 SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) { |
| 17 SkOrderedWriteBuffer writer(1024); | 15 SkOrderedWriteBuffer writer(1024); |
| 18 writer.setFlags(SkOrderedWriteBuffer::kCrossProcess_Flag); | 16 writer.setFlags(SkOrderedWriteBuffer::kValidation_Flag); |
| 19 writer.writeFlattenable(flattenable); | 17 writer.writeFlattenable(flattenable); |
| 20 uint32_t size = writer.bytesWritten(); | 18 uint32_t size = writer.bytesWritten(); |
| 21 void* data = sk_malloc_throw(size); | 19 void* data = sk_malloc_throw(size); |
| 22 writer.writeToMemory(data); | 20 writer.writeToMemory(data); |
| 23 return SkData::NewFromMalloc(data, size); | 21 return SkData::NewFromMalloc(data, size); |
| 24 } | 22 } |
| 25 | 23 |
| 26 // TODO: this guy should be renamed to ImageFilter, or take SkFlattenable::Type
as a parameter. | 24 SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size, |
| 27 SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size) { | 25 SkFlattenable::Type type) { |
| 28 SkOrderedReadBuffer buffer(data, size); | 26 SkValidatingReadBuffer buffer(data, size); |
| 29 return buffer.readImageFilter(); | 27 return buffer.readFlattenable(type); |
| 30 } | 28 } |
| OLD | NEW |