diff options
| author |  Mike Reed <reed@google.com> | 2018-01-23 11:57:30 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-23 18:13:35 +0000 |
| commit | 0331d37af9656e2e7c5dd1d79cb12396d51a19e9 (patch) | |
| tree | 9935e6ee3078255353e817870c8ed03d1601c0ac /tests/ImageFilterTest.cpp | |
| parent | da8139f4d4b9340354b0697cae126e8bdf583801 (diff) | |
remove unneeded SkFlattenableSerialization
Bug: skia:
Change-Id: I5cf40b88b05dcd8e83383f6271b046eac8d55e35
Reviewed-on: https://skia-review.googlesource.com/98642
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/ImageFilterTest.cpp')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index e17a94f68f..8aa3190bcd 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -15,7 +15,6 @@ #include "SkComposeImageFilter.h" #include "SkDisplacementMapEffect.h" #include "SkDropShadowImageFilter.h" -#include "SkFlattenableSerialization.h" #include "SkGradientShader.h" #include "SkImage.h" #include "SkImageFilterPriv.h" @@ -1644,9 +1643,8 @@ DEF_TEST(ImageFilterImageSourceSerialization, reporter) { sk_sp<SkImage> image(surface->makeImageSnapshot()); sk_sp<SkImageFilter> filter(SkImageSource::Make(std::move(image))); - sk_sp<SkData> data(SkValidatingSerializeFlattenable(filter.get())); - sk_sp<SkImageFilter> unflattenedFilter = SkValidatingDeserializeImageFilter(data->data(), - data->size()); + sk_sp<SkData> data(filter->serialize()); + sk_sp<SkImageFilter> unflattenedFilter = SkImageFilter::Deserialize(data->data(), data->size()); REPORTER_ASSERT(reporter, unflattenedFilter); SkBitmap bm; @@ -1666,8 +1664,7 @@ DEF_TEST(ImageFilterImageSourceUninitialized, r) { if (!data) { return; } - sk_sp<SkImageFilter> unflattenedFilter = SkValidatingDeserializeImageFilter(data->data(), - data->size()); + sk_sp<SkImageFilter> unflattenedFilter = SkImageFilter::Deserialize(data->data(), data->size()); // This will fail. More importantly, msan will verify that we did not // compare against uninitialized memory. REPORTER_ASSERT(r, !unflattenedFilter); |