Enabling validation code in serialization and adding serialization to fuzzer
BUG=
Committed: http://code.google.com/p/skia/source/detail?r=11968
R=reed@google.com, mtklein@google.com, senorblanco@chromium.org, bsalomon@google.com, robertphillips@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/44573002
git-svn-id: http://skia.googlecode.com/svn/trunk@11981 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 17e8306..c04292d 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
@@ -7,13 +6,14 @@
*/
#include "SampleCode.h"
#include "SkBicubicImageFilter.h"
+#include "SkBitmapDevice.h"
#include "SkBitmapSource.h"
#include "SkBlurImageFilter.h"
#include "SkCanvas.h"
#include "SkColorFilter.h"
#include "SkColorFilterImageFilter.h"
#include "SkComposeImageFilter.h"
-#include "SkBitmapDevice.h"
+#include "SkData.h"
#include "SkDisplacementMapEffect.h"
#include "SkDropShadowImageFilter.h"
#include "SkFlattenableSerialization.h"
@@ -262,6 +262,25 @@
return (filter || canBeNull) ? filter : make_image_filter(canBeNull);
}
+static SkImageFilter* make_serialized_image_filter() {
+ SkAutoTUnref<SkImageFilter> filter(make_image_filter(false));
+ SkAutoTUnref<SkData> data(SkValidatingSerializeFlattenable(filter));
+ const unsigned char* ptr = static_cast<const unsigned char*>(data->data());
+ size_t len = data->size();
+#ifdef SK_ADD_RANDOM_BIT_FLIPS
+ unsigned char* p = const_cast<unsigned char*>(ptr);
+ for (size_t i = 0; i < len; ++i, ++p) {
+ if ((R(1000) == 1)) { // 0.1% of the time, flip a bit
+ *p ^= (1 << R(8));
+ }
+ }
+#endif // SK_ADD_RANDOM_BIT_FLIPS
+ SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(ptr, len,
+ SkImageFilter::GetFlattenableType());
+ SkASSERT(NULL != flattenable);
+ return static_cast<SkImageFilter*>(flattenable);
+}
+
static void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
canvas->save();
canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
@@ -272,7 +291,7 @@
static void do_fuzz(SkCanvas* canvas) {
SkPaint paint;
- paint.setImageFilter(make_image_filter());
+ paint.setImageFilter(make_serialized_image_filter())->unref();
drawClippedBitmap(canvas, 0, 0, paint);
}