aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkFlattenableSerialization.h
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-16 13:19:11 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-16 13:19:11 +0000
commit478884f7d3b8c7be8b62f3fa2b79192f411c3fec (patch)
tree327028a78b03a871d050fd8254e83a7e11e834bd /include/core/SkFlattenableSerialization.h
parent3ef7eeac9a2205285ca56d2d70e4d6740af556e6 (diff)
Revert 11247, 11250, 11251 and 11279 to unblock DEPS roll (https://codereview.chromium.org/24159002/)
11279 Sanitizing source files in Housekeeper-Nightly - https://code.google.com/p/skia/source/detail?r=11279 11251 More warnings as errors fixes - https://code.google.com/p/skia/source/detail?r=11251 11250 Warnings as errors fix - https://code.google.com/p/skia/source/detail?r=11250 11247 Initial error handling code - https://chromiumcodereview.appspot.com/23021015 git-svn-id: http://skia.googlecode.com/svn/trunk@11285 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkFlattenableSerialization.h')
-rw-r--r--include/core/SkFlattenableSerialization.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h
index 26463bbca9..720bae0917 100644
--- a/include/core/SkFlattenableSerialization.h
+++ b/include/core/SkFlattenableSerialization.h
@@ -13,14 +13,8 @@
class SkData;
class SkFlattenable;
-/**
- * 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);
+SK_API SkData* SkSerializeFlattenable(SkFlattenable*);
+SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size);
// Temporary fix for canary build
#define SkSerializeFlattenable SkValidatingSerializeFlattenable