diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-17 13:28:47 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-17 13:29:00 +0000 |
| commit | e14349a7545e7bd1e93f4c3095db8f481939b053 (patch) | |
| tree | e6125d64ef731f6ea4c4455bc1ea6d008ab6e882 /tests/ImageFilterTest.cpp | |
| parent | 2028625f9b92b3423d841a926f785140a8955a84 (diff) | |
Revert "Replace SkSpecialImage::makeTightSubset with asImage"
This reverts commit 5df6db15dc04ea7f8c8fa7a7b58ecb881d7a70fe.
Reason for revert: Possibly blocking Chrome DEPS roll
Original change's description:
> Replace SkSpecialImage::makeTightSubset with asImage
>
> This should allow the relanding of:
>
> https://skia-review.googlesource.com/c/8450/ (Remove asTextureRef from SkSpecialImage & update effects accordingly (take 2))
>
> Change-Id: I517af11036e3f44a280bbe6b9275f6c38f4a86a4
> Reviewed-on: https://skia-review.googlesource.com/8498
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ib5bebda78b2323e65a73504a61af918872ad231f
Reviewed-on: https://skia-review.googlesource.com/8607
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ImageFilterTest.cpp')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 79f34f7654..28612e882b 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -1750,7 +1750,7 @@ DEF_TEST(ImageFilterBlurLargeImage, reporter) { } static void test_make_with_filter(skiatest::Reporter* reporter, GrContext* context) { - sk_sp<SkSurface> surface(create_surface(context, 192, 128)); + sk_sp<SkSurface> surface(create_surface(context, 100, 100)); surface->getCanvas()->clear(SK_ColorRED); SkPaint bluePaint; bluePaint.setColor(SK_ColorBLUE); @@ -1795,17 +1795,6 @@ static void test_make_with_filter(skiatest::Reporter* reporter, GrContext* conte SkIRect destRect = SkIRect::MakeXYWH(offset.x(), offset.y(), outSubset.width(), outSubset.height()); REPORTER_ASSERT(reporter, clipBounds.contains(destRect)); - - // In GPU-mode, this case creates a special image with a backing size that differs from - // the content size - { - clipBounds.setXYWH(0, 0, 170, 100); - subset.setXYWH(0, 0, 160, 90); - - filter = SkXfermodeImageFilter::Make(SkBlendMode::kSrc, nullptr); - result = sourceImage->makeWithFilter(filter.get(), subset, clipBounds, &outSubset, &offset); - REPORTER_ASSERT(reporter, result); - } } DEF_TEST(ImageFilterMakeWithFilter, reporter) { |