Chromium Code Reviews| Index: include/core/SkFlattenableSerialization.h |
| diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h |
| index 2ed244c1ed1d0d6e5f3f45894151da3c8afa7388..870d9fe2bf2edbe4ab3293c91c91f30a0935b55c 100644 |
| --- a/include/core/SkFlattenableSerialization.h |
| +++ b/include/core/SkFlattenableSerialization.h |
| @@ -8,12 +8,19 @@ |
| #ifndef SkFlattenableSerialization_DEFINED |
| #define SkFlattenableSerialization_DEFINED |
| -#include "SkTypes.h" |
| +#include "SkFlattenable.h" |
| class SkData; |
| -class SkFlattenable; |
| -SK_API SkData* SkSerializeFlattenable(SkFlattenable*); |
| -SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size); |
| +SK_API SkData* SkValidatingSerializeFlattenable(SkFlattenable*); |
| +SK_API SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size, |
| + SkFlattenable::Type type); |
| + |
| +// Temporary fix for canary build |
|
Stephen White
2013/10/25 16:13:11
Not sure I understand this. Is this changing all s
mtklein
2013/10/25 16:17:31
I think this is just a name refinement. Sk{Serial
Stephen White
2013/10/25 16:36:21
Ah, ok. Thanks.
sugoi1
2013/10/25 17:15:04
FYI, there's only a single user of these functions
|
| +#define SkSerializeFlattenable(flattenable) \ |
| +SkValidatingSerializeFlattenable(flattenable) |
| + |
| +#define SkDeserializeFlattenable(data, size) \ |
| +SkValidatingDeserializeFlattenable(data, size, SkFlattenable::kSkImageFilter_Type) |
| #endif |