Initial error handling code

include/core/SkFlattenableSerialization.h

Index: include/core/SkFlattenableSerialization.h
diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h
index 2ed244c1ed1d0d6e5f3f45894151da3c8afa7388..26463bbca9cc73bd7434189c3ec87c578263043a 100644
--- a/include/core/SkFlattenableSerialization.h
+++ b/include/core/SkFlattenableSerialization.h
@@ -13,7 +13,17 @@
 class SkData;
 class SkFlattenable;
 
-SK_API SkData* SkSerializeFlattenable(SkFlattenable*);
-SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size);
+/**
+ *  These utility functions are used by the chromium codebase to safely
+ *  serialize and deserialize SkFlattenable objects. These aren't made for
+ *  optimal speed, but rather designed with security in mind in order to
+ *  prevent Skia from being an entry point for potential attacks.
+ */
+SK_API SkData* SkValidatingSerializeFlattenable(SkFlattenable*);
+SK_API SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size);
+
+// Temporary fix for canary build
+#define SkSerializeFlattenable SkValidatingSerializeFlattenable
+#define SkDeserializeFlattenable SkValidatingDeserializeFlattenable
 
 #endif