diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-25 21:04:40 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-25 21:04:40 +0000 |
| commit | d25d6c7b8ecd4105157f0293a081549ba32ef968 (patch) | |
| tree | b3d624aa741bdbc002acbb1f493cc9bc76348c71 /include/core/SkFlattenableSerialization.h | |
| parent | 10ba006631a0c350aa2bcba188a60404869607c8 (diff) | |
Enabling validation code in serialization and adding serialization to fuzzer
BUG=
R=reed@google.com, mtklein@google.com, senorblanco@chromium.org, bsalomon@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/44573002
git-svn-id: http://skia.googlecode.com/svn/trunk@11968 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkFlattenableSerialization.h')
| -rw-r--r-- | include/core/SkFlattenableSerialization.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h index 2ed244c1ed..870d9fe2bf 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 +#define SkSerializeFlattenable(flattenable) \ +SkValidatingSerializeFlattenable(flattenable) + +#define SkDeserializeFlattenable(data, size) \ +SkValidatingDeserializeFlattenable(data, size, SkFlattenable::kSkImageFilter_Type) #endif |