diff options
| author |  msarett <msarett@google.com> | 2016-04-04 13:53:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 13:53:02 -0700 |
| commit | 99d9231f6a4cb6b85b8637e9d8ae32f8bd7c466f (patch) | |
| tree | afd7ff51e10b4860da79285cb19fb28d65c7f52d /tests | |
| parent | c19201f315d0fd91a6320c48ce18e5a87c4e8bda (diff) | |
Delete SkFlattenable::Type
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1834303003
Review URL: https://codereview.chromium.org/1834303003
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 4 | ||||
| -rw-r--r-- | tests/SerializationTest.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index e6430b4d87..c6f0433459 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -1089,7 +1089,7 @@ DEF_TEST(ImageFilterCrossProcessPictureImageFilter, reporter) { // cross-process. Do this by "laundering" it through SkValidatingReadBuffer. SkAutoTUnref<SkData> data(SkValidatingSerializeFlattenable(imageFilter.get())); SkAutoTUnref<SkFlattenable> flattenable(SkValidatingDeserializeFlattenable( - data->data(), data->size(), SkImageFilter::GetFlattenableType())); + data->data(), data->size())); SkImageFilter* unflattenedFilter = static_cast<SkImageFilter*>(flattenable.get()); redPaintWithFilter.setImageFilter(unflattenedFilter); @@ -1536,7 +1536,7 @@ DEF_TEST(ImageFilterImageSourceSerialization, reporter) { sk_sp<SkData> data(SkValidatingSerializeFlattenable(filter.get())); sk_sp<SkFlattenable> flattenable(SkValidatingDeserializeFlattenable( - data->data(), data->size(), SkImageFilter::GetFlattenableType())); + data->data(), data->size())); SkImageFilter* unflattenedFilter = static_cast<SkImageFilter*>(flattenable.get()); REPORTER_ASSERT(reporter, unflattenedFilter); diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 15b73827ae..b590fb5821 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -42,7 +42,7 @@ template<typename T> struct SerializationUtils { writer.writeFlattenable(flattenable); } static void Read(SkValidatingReadBuffer& reader, T** flattenable) { - *flattenable = (T*)reader.readFlattenable(T::GetFlattenableType()); + *flattenable = (T*)reader.readFlattenable(); } }; |