guard rasterizer and drawlooper setters
Need to land https://codereview.chromium.org/1823513002/ first
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1821533002
Review URL: https://codereview.chromium.org/1821533002
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp
index f5b43fb..80debeb 100644
--- a/samplecode/ClockFaceView.cpp
+++ b/samplecode/ClockFaceView.cpp
@@ -163,7 +163,7 @@
p.setAntiAlias(true);
r7(&rastBuilder, p, scale);
- paint->setRasterizer(rastBuilder.detachRasterizer())->unref();
+ paint->setRasterizer(rastBuilder.detach());
paint->setColor(SK_ColorBLUE);
}
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 2bbe29f..b8b0ee6 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -152,7 +152,7 @@
p.setAntiAlias(false);
SkLayerRasterizer::Builder rastBuilder2;
r5(&rastBuilder2, p);
- p.setRasterizer(rastBuilder2.detachRasterizer())->unref();
+ p.setRasterizer(rastBuilder2.detach());
p.setXfermodeMode(SkXfermode::kClear_Mode);
rastBuilder->addLayer(p);
}
@@ -246,7 +246,7 @@
p.setAntiAlias(true);
proc(&rastBuilder, p);
- paint->setRasterizer(rastBuilder.detachRasterizer())->unref();
+ paint->setRasterizer(rastBuilder.detach());
}
#if 1
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index fe2fb0b..dd0fa40 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -536,8 +536,7 @@
paintForRasterizer = make_paint();
}
rasterizerBuilder.addLayer(paintForRasterizer);
- SkAutoTUnref<SkRasterizer> rasterizer(rasterizerBuilder.detachRasterizer());
- paint.setRasterizer(rasterizer);
+ paint.setRasterizer(rasterizerBuilder.detach());
paint.setImageFilter(make_image_filter());
SkAutoDataUnref data(make_3Dlut(nullptr, make_bool(), make_bool(), make_bool()));
paint.setTextAlign(make_paint_align());
diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp
index 10715f3..1f9915d 100644
--- a/samplecode/SamplePathEffects.cpp
+++ b/samplecode/SamplePathEffects.cpp
@@ -152,7 +152,7 @@
paint.setARGB(0xFF, 0, 0, 0);
paint.setPathEffect(make_warp_pe(fPhase));
TestRastBuilder testRastBuilder;
- paint.setRasterizer(testRastBuilder.detachRasterizer())->unref();
+ paint.setRasterizer(testRastBuilder.detach());
canvas->drawPath(fPath, paint);
}
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index ca0d9df..9b054ad 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -544,7 +544,7 @@
p.setAntiAlias(false);
SkLayerRasterizer::Builder rastBuilder2;
r5(&rastBuilder2, p);
- p.setRasterizer(rastBuilder2.detachRasterizer())->unref();
+ p.setRasterizer(rastBuilder2.detach());
p.setXfermodeMode(SkXfermode::kClear_Mode);
rastBuilder->addLayer(p);
}
@@ -615,7 +615,7 @@
p.setAntiAlias(true);
proc(&rastBuilder, p);
- paint->setRasterizer(rastBuilder.detachRasterizer())->unref();
+ paint->setRasterizer(rastBuilder.detach());
paint->setColor(SK_ColorBLUE);
}
diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp
index ea2ae81..7c71084 100644
--- a/samplecode/SampleTextOnPath.cpp
+++ b/samplecode/SampleTextOnPath.cpp
@@ -35,10 +35,8 @@
canvas->drawPath(path, paint);
- paint.setLooper(SkBlurDrawLooper::Create(SK_ColorBLACK,
- SkBlurMask::ConvertRadiusToSigma(0.002f),
- 0.0f,
- 0.0f))->unref();
+ paint.setLooper(SkBlurDrawLooper::Make(SK_ColorBLACK, SkBlurMask::ConvertRadiusToSigma(0.002f),
+ 0.0f, 0.0f));
const char* text = "DRAWING STROKED TEXT WITH A BLUR ON A PATH";
size_t len = strlen(text);
diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index 62f055f..dbc7d09 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -55,12 +55,12 @@
class TilingView : public SampleView {
sk_sp<SkPicture> fTextPicture;
- SkAutoTUnref<SkDrawLooper> fLooper;
+ sk_sp<SkDrawLooper> fLooper;
public:
TilingView()
- : fLooper(SkBlurDrawLooper::Create(0x88000000,
- SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(1)),
- SkIntToScalar(2), SkIntToScalar(2))) {
+ : fLooper(SkBlurDrawLooper::Make(0x88000000,
+ SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(1)),
+ SkIntToScalar(2), SkIntToScalar(2))) {
for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) {
makebm(&fTexture[i], gColorTypes[i], gWidth, gHeight);
}
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index fb9735c..919fb64 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -80,10 +80,9 @@
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(SkIntToScalar(24));
- SkAutoTUnref<SkDrawLooper> looper(
- SkBlurDrawLooper::Create(SK_ColorBLUE,
- SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(2)),
- 0, 0));
+ auto looper(
+ SkBlurDrawLooper::Make(SK_ColorBLUE, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(2)),
+ 0, 0));
paint.setLooper(looper);
SkScalar height = paint.getFontMetrics(nullptr);
if (!fDecodeSucceeded) {