diff -r 000000000000 -r 6474c204b198 gfx/skia/trunk/src/core/SkFlattenableSerialization.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/skia/trunk/src/core/SkFlattenableSerialization.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFlattenableSerialization.h"
+
+#include "SkData.h"
+#include "SkValidatingReadBuffer.h"
+#include "SkWriteBuffer.h"
+
+SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) {
+    SkWriteBuffer writer(SkWriteBuffer::kValidation_Flag);
+    writer.writeFlattenable(flattenable);
+    size_t size = writer.bytesWritten();
+    void* data = sk_malloc_throw(size);
+    writer.writeToMemory(data);
+    return SkData::NewFromMalloc(data, size);
+}
+
+SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size,
+                                                  SkFlattenable::Type type) {
+    SkValidatingReadBuffer buffer(data, size);
+    return buffer.readFlattenable(type);
+}