aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-28 12:08:52 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-28 12:08:52 +0000
commit3721ee652aa53e8fdd700f1f02d582f5efdcb60b (patch)
treeaa012e8b62ed975f7860d5edc0559cb5d0cb1f63 /include
parentb2e9fa529862bd1f7b983a17b3c72acfb3d0367d (diff)
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@11974 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkFlattenableSerialization.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h
index 870d9fe2bf..2ed244c1ed 100644
--- a/include/core/SkFlattenableSerialization.h
+++ b/include/core/SkFlattenableSerialization.h
@@ -8,19 +8,12 @@
#ifndef SkFlattenableSerialization_DEFINED
#define SkFlattenableSerialization_DEFINED
-#include "SkFlattenable.h"
+#include "SkTypes.h"
class SkData;
+class SkFlattenable;
-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)
+SK_API SkData* SkSerializeFlattenable(SkFlattenable*);
+SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size);
#endif