diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-06 18:47:25 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-06 18:47:25 +0000 |
commit | 8b4799a98b05d626432b11115b5c2f0e0bb1772d (patch) | |
tree | 498c0c8e90b9dc401627ac2725b32dabca8bffda /samplecode | |
parent | 670b98ea5df48daef5d23e2bb7570d408207c333 (diff) |
Revert of r13347 (Serialization of SkPictureImageFilter - https://codereview.chromium.org/138063005) due to bump in skp file format
git-svn-id: http://skia.googlecode.com/svn/trunk@13348 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 4ef7d4033a..f77f3b814d 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -184,30 +184,6 @@ static const SkBitmap& make_bitmap() { return bitmap[R(2)]; } -#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION -static void drawSomething(SkCanvas* canvas) { - SkPaint paint; - - canvas->save(); - canvas->scale(0.5f, 0.5f); - canvas->drawBitmap(make_bitmap(), 0, 0, NULL); - canvas->restore(); - - const char beforeStr[] = "before circle"; - const char afterStr[] = "after circle"; - - paint.setAntiAlias(true); - - paint.setColor(SK_ColorRED); - canvas->drawData(beforeStr, sizeof(beforeStr)); - canvas->drawCircle(SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/3), paint); - canvas->drawData(afterStr, sizeof(afterStr)); - paint.setColor(SK_ColorBLACK); - paint.setTextSize(SkIntToScalar(kBitmapSize/3)); - canvas->drawText("Picture", 7, SkIntToScalar(kBitmapSize/2), SkIntToScalar(kBitmapSize/4), paint); -} -#endif - static SkImageFilter* make_image_filter(bool canBeNull = true) { SkImageFilter* filter = 0; @@ -318,16 +294,7 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) { filter = new SkTileImageFilter(make_rect(), make_rect(), make_image_filter(false)); break; case PICTURE: - { - SkPicture* pict = NULL; -#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION - pict = new SkPicture; - SkAutoUnref aur(pict); - drawSomething(pict->beginRecording(kBitmapSize, kBitmapSize)); - pict->endRecording(); -#endif - filter = new SkPictureImageFilter(pict, make_rect()); - } + filter = new SkPictureImageFilter(NULL, make_rect()); break; default: break; |