diff options
| author |  Mike Reed <reed@google.com> | 2018-01-23 15:29:32 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-23 21:14:20 +0000 |
| commit | 80747ef591ff3c09c2b610eb21258132d1ff4ef5 (patch) | |
| tree | e7472d73f966f9400b0e52cb02ad9e8515de32c3 /tests | |
| parent | a7701e032bcc55a73360aa8d1b53ceef566de991 (diff) | |
move the guts of SkMaskFilter.h into SkMaskFilterBase.h
Bug: skia:
Change-Id: I29ad0960156562867429542d3cfbf3d639529cab
Reviewed-on: https://skia-review.googlesource.com/98802
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/BlurTest.cpp | 9 | ||||
| -rw-r--r-- | tests/FlattenDrawableTest.cpp | 15 |
2 files changed, 20 insertions, 4 deletions
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 6c5ef269d7..d8d917fe8f 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -12,6 +12,7 @@ #include "SkColorFilter.h" #include "SkEmbossMaskFilter.h" #include "SkLayerDrawLooper.h" +#include "SkMaskFilterBase.h" #include "SkMath.h" #include "SkPaint.h" #include "SkPath.h" @@ -456,8 +457,8 @@ DEF_TEST(BlurAsABlur, reporter) { REPORTER_ASSERT(reporter, sigma <= 0); } else { REPORTER_ASSERT(reporter, sigma > 0); - SkMaskFilter::BlurRec rec; - bool success = mf->asABlur(&rec); + SkMaskFilterBase::BlurRec rec; + bool success = as_MFB(mf)->asABlur(&rec); if (flags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag) { REPORTER_ASSERT(reporter, !success); } else { @@ -483,8 +484,8 @@ DEF_TEST(BlurAsABlur, reporter) { const SkScalar sigma = sigmas[j]; auto mf(SkEmbossMaskFilter::Make(sigma, light)); if (mf) { - SkMaskFilter::BlurRec rec; - bool success = mf->asABlur(&rec); + SkMaskFilterBase::BlurRec rec; + bool success = as_MFB(mf)->asABlur(&rec); REPORTER_ASSERT(reporter, !success); } } diff --git a/tests/FlattenDrawableTest.cpp b/tests/FlattenDrawableTest.cpp index 9df8ba0b5b..411b082dba 100644 --- a/tests/FlattenDrawableTest.cpp +++ b/tests/FlattenDrawableTest.cpp @@ -284,3 +284,18 @@ DEF_TEST(FlattenRecordedDrawable, r) { REPORTER_ASSERT(r, out); REPORTER_ASSERT(r, !strcmp("SkRecordedDrawable", out->getTypeName())); } + +// be sure these constructs compile, don't assert, and return null +DEF_TEST(Flattenable_EmptyDeserialze, reporter) { + auto data = SkData::MakeEmpty(); + + #define test(name) REPORTER_ASSERT(reporter, !name::Deserialize(data->data(), data->size())) + test(SkPathEffect); + test(SkMaskFilter); + test(SkShaderBase); // todo: make this just be shader! + test(SkColorFilter); + test(SkImageFilter); + test(SkDrawLooper); + #undef test +} + |