diff options
| author |  reed <reed@google.com> | 2015-06-09 08:18:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-09 08:18:40 -0700 |
| commit | 2c55d7b7f3c2c834085d019bf6b1519b315c8aa1 (patch) | |
| tree | e8b584e6f7f085132c2333e87b060e65f7f77ca8 /tests | |
| parent | ded9a6f794a43fc9ec7b370559ba0699c061628d (diff) | |
remove subclassing from ImageFilter::Proxy
BUG=skia:
Review URL: https://codereview.chromium.org/1172693002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 0076ac56fb..fc709da5af 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -13,7 +13,6 @@ #include "SkColorFilterImageFilter.h" #include "SkColorMatrixFilter.h" #include "SkComposeImageFilter.h" -#include "SkDeviceImageFilterProxy.h" #include "SkDisplacementMapEffect.h" #include "SkDropShadowImageFilter.h" #include "SkFlattenableSerialization.h" @@ -272,7 +271,7 @@ static void test_crop_rects(SkBaseDevice* device, skiatest::Reporter* reporter) SkBitmap bitmap; bitmap.allocN32Pixels(100, 100); bitmap.eraseARGB(0, 0, 0, 0); - SkDeviceImageFilterProxy proxy(device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); + SkImageFilter::Proxy proxy(device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); SkImageFilter::CropRect inputCropRect(SkRect::MakeXYWH(8, 13, 80, 80)); SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(20, 30, 60, 60)); @@ -352,7 +351,7 @@ static void test_negative_blur_sigma(SkBaseDevice* device, skiatest::Reporter* r // Check that SkBlurImageFilter will accept a negative sigma, either in // the given arguments or after CTM application. int width = 32, height = 32; - SkDeviceImageFilterProxy proxy(device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); + SkImageFilter::Proxy proxy(device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); SkScalar five = SkIntToScalar(5); SkAutoTUnref<SkBlurImageFilter> positiveFilter( @@ -888,7 +887,7 @@ DEF_TEST(ImageFilterClippedPictureImageFilter, reporter) { SkBitmap bitmap; bitmap.allocN32Pixels(2, 2); SkBitmapDevice device(bitmap); - SkDeviceImageFilterProxy proxy(&device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); + SkImageFilter::Proxy proxy(&device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); REPORTER_ASSERT(reporter, !imageFilter->filterImage(&proxy, bitmap, ctx, &result, &offset)); } @@ -1131,7 +1130,7 @@ DEF_TEST(ComposedImageFilterOffset, reporter) { bitmap.allocN32Pixels(100, 100); bitmap.eraseARGB(0, 0, 0, 0); SkBitmapDevice device(bitmap); - SkDeviceImageFilterProxy proxy(&device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); + SkImageFilter::Proxy proxy(&device, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)); SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(1, 0, 20, 20)); SkAutoTUnref<SkImageFilter> offsetFilter(SkOffsetImageFilter::Create(0, 0, NULL, &cropRect)); |