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