diff options
| author |  hcm <hcm@google.com> | 2014-10-27 20:55:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-27 20:55:01 -0700 |
| commit | d0f1969100a0c00f41166f2fe616de56d44f4a59 (patch) | |
| tree | 6e84e12ef702ed1618473e8316a53f4b0feb6a6b /tests | |
| parent | 4984d473aba2c3ca2dc3ce834978718d4b9d56a8 (diff) | |
Revert of Fix bounds computation of all 0-input filters. (patchset #2 id:20001 of https://codereview.chromium.org/681643003/)
Reason for revert:
try again
Original issue's description:
> Fix bounds computation of all 0-input filters.
>
> The SkRectShaderImageFilter had the same bug as previously fixed for
> SkBitmapSource and SkPictureImageFilter. Rather than copy-and-paste
> the implementation, this change makes all filters with 0 inputs return
> their source bounds, instead of returning false.
>
> BUG=427251
>
> Committed: https://skia.googlesource.com/skia/+/ba036cc82b5a543a13cafd11a19ba0e3087fca38
TBR=bsalomon@google.com,senorblanco@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=427251
Review URL: https://codereview.chromium.org/678273002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index e032a810ca..778230b5d6 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -23,13 +23,11 @@ #include "SkMergeImageFilter.h" #include "SkMorphologyImageFilter.h" #include "SkOffsetImageFilter.h" -#include "SkPerlinNoiseShader.h" #include "SkPicture.h" #include "SkPictureImageFilter.h" #include "SkPictureRecorder.h" #include "SkReadBuffer.h" #include "SkRect.h" -#include "SkRectShaderImageFilter.h" #include "SkTileImageFilter.h" #include "SkXfermodeImageFilter.h" #include "Test.h" @@ -401,9 +399,6 @@ DEF_TEST(ImageFilterDrawTiled, reporter) { recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 30, 20)), greenPaint); SkAutoTUnref<SkPicture> picture(recorder.endRecording()); SkAutoTUnref<SkImageFilter> pictureFilter(SkPictureImageFilter::Create(picture.get())); - SkAutoTUnref<SkShader> shader(SkPerlinNoiseShader::CreateTurbulence(SK_Scalar1, SK_Scalar1, 1, 0)); - - SkAutoTUnref<SkImageFilter> rectShaderFilter(SkRectShaderImageFilter::Create(shader.get())); struct { const char* fName; @@ -435,7 +430,6 @@ DEF_TEST(ImageFilterDrawTiled, reporter) { { "matrix", SkMatrixImageFilter::Create(matrix, SkPaint::kLow_FilterLevel) }, { "blur and offset", SkOffsetImageFilter::Create(five, five, blur.get()) }, { "picture and blur", SkBlurImageFilter::Create(five, five, pictureFilter.get()) }, - { "rect shader and blur", SkBlurImageFilter::Create(five, five, rectShaderFilter.get()) }, }; SkBitmap untiledResult, tiledResult; |