From 0331d37af9656e2e7c5dd1d79cb12396d51a19e9 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 23 Jan 2018 11:57:30 -0500 Subject: remove unneeded SkFlattenableSerialization Bug: skia: Change-Id: I5cf40b88b05dcd8e83383f6271b046eac8d55e35 Reviewed-on: https://skia-review.googlesource.com/98642 Reviewed-by: Mike Reed Reviewed-by: Florin Malita Commit-Queue: Mike Reed --- tests/ImageFilterTest.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/ImageFilterTest.cpp') 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 image(surface->makeImageSnapshot()); sk_sp filter(SkImageSource::Make(std::move(image))); - sk_sp data(SkValidatingSerializeFlattenable(filter.get())); - sk_sp unflattenedFilter = SkValidatingDeserializeImageFilter(data->data(), - data->size()); + sk_sp data(filter->serialize()); + sk_sp 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 unflattenedFilter = SkValidatingDeserializeImageFilter(data->data(), - data->size()); + sk_sp 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); -- cgit v1.2.3