Index: gm/imagefiltersgraph.cpp |
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp |
index 547a3bbbe229c8ce3a9fdfd2162c8ce730609afc..fa9c512591a06d9130b01bc0b4b3aabf922332cb 100644 |
--- a/gm/imagefiltersgraph.cpp |
+++ b/gm/imagefiltersgraph.cpp |
@@ -119,10 +119,11 @@ |
canvas->clear(SK_ColorBLACK); |
{ |
SkAutoTUnref<SkImageFilter> bitmapSource(SkImageSource::Create(fImage.get())); |
- auto cf(SkColorFilter::MakeModeFilter(SK_ColorRED, SkXfermode::kSrcIn_Mode)); |
+ SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(SK_ColorRED, |
+ SkXfermode::kSrcIn_Mode)); |
SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(4.0f, 4.0f, bitmapSource)); |
SkAutoTUnref<SkImageFilter> erode(SkErodeImageFilter::Create(4, 4, blur)); |
- SkAutoTUnref<SkImageFilter> color(SkColorFilterImageFilter::Create(cf.get(), erode)); |
+ SkAutoTUnref<SkImageFilter> color(SkColorFilterImageFilter::Create(cf, erode)); |
SkAutoTUnref<SkImageFilter> merge(SkMergeImageFilter::Create(blur, color)); |
SkPaint paint; |
@@ -138,8 +139,8 @@ |
0, 0, SK_Scalar1, 0, 0, |
0, 0, 0, 0.5f, 0 }; |
- auto matrixFilter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); |
- SkAutoTUnref<SkImageFilter> colorMorph(SkColorFilterImageFilter::Create(matrixFilter.get(), morph)); |
+ SkAutoTUnref<SkColorFilter> matrixFilter(SkColorMatrixFilter::Create(matrix)); |
+ SkAutoTUnref<SkImageFilter> colorMorph(SkColorFilterImageFilter::Create(matrixFilter, morph)); |
SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(SkXfermode::kSrcOver_Mode)); |
SkAutoTUnref<SkImageFilter> blendColor(SkXfermodeImageFilter::Create(mode, colorMorph)); |
@@ -153,8 +154,8 @@ |
0, SK_Scalar1, 0, 0, 0, |
0, 0, SK_Scalar1, 0, 0, |
0, 0, 0, 0.5f, 0 }; |
- auto matrixCF(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); |
- SkAutoTUnref<SkImageFilter> matrixFilter(SkColorFilterImageFilter::Create(matrixCF.get())); |
+ SkAutoTUnref<SkColorFilter> matrixCF(SkColorMatrixFilter::Create(matrix)); |
+ SkAutoTUnref<SkImageFilter> matrixFilter(SkColorFilterImageFilter::Create(matrixCF)); |
SkAutoTUnref<SkImageFilter> offsetFilter( |
SimpleOffsetFilter::Create(10.0f, 10.f, matrixFilter)); |
@@ -217,14 +218,16 @@ |
} |
{ |
// Test that crop offsets are absolute, not relative to the parent's crop rect. |
- auto cf1(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode)); |
- auto cf2(SkColorFilter::MakeModeFilter(SK_ColorGREEN, SkXfermode::kSrcIn_Mode)); |
+ SkAutoTUnref<SkColorFilter> cf1(SkColorFilter::CreateModeFilter(SK_ColorBLUE, |
+ SkXfermode::kSrcIn_Mode)); |
+ SkAutoTUnref<SkColorFilter> cf2(SkColorFilter::CreateModeFilter(SK_ColorGREEN, |
+ SkXfermode::kSrcIn_Mode)); |
SkImageFilter::CropRect outerRect(SkRect::MakeXYWH(SkIntToScalar(10), SkIntToScalar(10), |
SkIntToScalar(80), SkIntToScalar(80))); |
SkImageFilter::CropRect innerRect(SkRect::MakeXYWH(SkIntToScalar(20), SkIntToScalar(20), |
SkIntToScalar(60), SkIntToScalar(60))); |
- SkAutoTUnref<SkImageFilter> color1(SkColorFilterImageFilter::Create(cf1.get(), nullptr, &outerRect)); |
- SkAutoTUnref<SkImageFilter> color2(SkColorFilterImageFilter::Create(cf2.get(), color1, &innerRect)); |
+ SkAutoTUnref<SkImageFilter> color1(SkColorFilterImageFilter::Create(cf1, nullptr, &outerRect)); |
+ SkAutoTUnref<SkImageFilter> color2(SkColorFilterImageFilter::Create(cf2, color1, &innerRect)); |
SkPaint paint; |
paint.setImageFilter(color2); |