From 8ad91a9bf896d728b905124847d74787aac698a7 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 19 Jan 2018 19:09:32 -0500 Subject: remove unused SkRasterizer Bug: skia:7500 Change-Id: Iaa683cf8f0b18887cce4ec676631d1e1efee1712 Reviewed-on: https://skia-review.googlesource.com/97400 Reviewed-by: Florin Malita Commit-Queue: Mike Reed --- samplecode/ClockFaceView.cpp | 27 ------ samplecode/SampleAll.cpp | 199 --------------------------------------- samplecode/SampleArc.cpp | 1 - samplecode/SampleFilterFuzz.cpp | 8 -- samplecode/SamplePathEffects.cpp | 17 ---- samplecode/SampleSlides.cpp | 181 ----------------------------------- 6 files changed, 433 deletions(-) (limited to 'samplecode') diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 841df26e7b..14c2350c38 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -20,7 +20,6 @@ #include "SkTypeface.h" #include "SkGradientShader.h" -#include "SkLayerRasterizer.h" #include "SkBlurMaskFilter.h" #include "Sk2DPathEffect.h" @@ -110,31 +109,6 @@ static sk_sp makepe(float interp, SkTDArray* pts) { return sk_make_sp(rad, lattice, pts); } -static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p, SkScalar interp) { - p.setPathEffect(makepe(SkScalarToFloat(interp), nullptr)); - rastBuilder->addLayer(p); -#if 0 - p.setPathEffect(new InverseFillPE())->unref(); - p.setXfermodeMode(SkXfermode::kSrcIn_Mode); - p.setXfermodeMode(SkXfermode::kClear_Mode); - p.setAlpha((1 - interp) * 255); - rastBuilder->addLayer(p); -#endif -} - -typedef void (*raster_proc)(SkLayerRasterizer*, SkPaint&); - -static void apply_shader(SkPaint* paint, float scale) { - SkPaint p; - SkLayerRasterizer::Builder rastBuilder; - - p.setAntiAlias(true); - r7(&rastBuilder, p, scale); - paint->setRasterizer(rastBuilder.detach()); - - paint->setColor(SK_ColorBLUE); -} - class ClockFaceView : public SkView { sk_sp fFace; SkScalar fInterp; @@ -193,7 +167,6 @@ protected: paint.setTypeface(fFace); - apply_shader(&paint, SkScalarToFloat(fInterp)); canvas->drawString(str, x, y, paint); // drawdots(canvas, paint); diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 5e4700a5db..de9038bed8 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -20,7 +20,6 @@ #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkGradientShader.h" -#include "SkLayerRasterizer.h" #include "SkMath.h" #include "SkPath.h" #include "SkPictureRecorder.h" @@ -36,86 +35,6 @@ #include #include "DecodeFile.h" -static void r0(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - p.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), - SkBlurMaskFilter::kNone_BlurFlag)); - rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); - - p.setMaskFilter(nullptr); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1); - rastBuilder->addLayer(p); - - p.setAlpha(0x11); - p.setStyle(SkPaint::kFill_Style); - p.setBlendMode(SkBlendMode::kSrc); - rastBuilder->addLayer(p); -} - -static void r1(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - rastBuilder->addLayer(p); - - p.setAlpha(0x40); - p.setBlendMode(SkBlendMode::kSrc); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1*2); - rastBuilder->addLayer(p); -} - -static void r2(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - p.setStyle(SkPaint::kStrokeAndFill_Style); - p.setStrokeWidth(SK_Scalar1*4); - rastBuilder->addLayer(p); - - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1*3/2); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); -} - -static void r3(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1*3); - rastBuilder->addLayer(p); - - p.setAlpha(0x20); - p.setStyle(SkPaint::kFill_Style); - p.setBlendMode(SkBlendMode::kSrc); - rastBuilder->addLayer(p); -} - -static void r4(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - p.setAlpha(0x60); - rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); - - p.setAlpha(0xFF); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p, SK_Scalar1*3/2, SK_Scalar1*3/2); - - p.setBlendMode(SkBlendMode::kSrcOver); - rastBuilder->addLayer(p); -} - -static void r5(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - rastBuilder->addLayer(p); - - p.setPathEffect(SkDiscretePathEffect::Make(SK_Scalar1*4, SK_Scalar1*3)); - p.setBlendMode(SkBlendMode::kSrcOut); - rastBuilder->addLayer(p); -} - -static void r6(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - rastBuilder->addLayer(p); - - p.setAntiAlias(false); - SkLayerRasterizer::Builder rastBuilder2; - r5(&rastBuilder2, p); - p.setRasterizer(rastBuilder2.detach()); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); -} - class Dot2DPathEffect : public Sk2DPathEffect { public: Dot2DPathEffect(SkScalar radius, const SkMatrix& matrix) @@ -139,81 +58,6 @@ private: typedef Sk2DPathEffect INHERITED; }; -static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - SkMatrix lattice; - lattice.setScale(SK_Scalar1*6, SK_Scalar1*6, 0, 0); - lattice.postSkew(SK_Scalar1/3, 0, 0, 0); - p.setPathEffect(sk_make_sp(SK_Scalar1*4, lattice)); - rastBuilder->addLayer(p); -} - -static void r8(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - rastBuilder->addLayer(p); - - SkMatrix lattice; - lattice.setScale(SK_Scalar1*6, SK_Scalar1*6, 0, 0); - lattice.postSkew(SK_Scalar1/3, 0, 0, 0); - p.setPathEffect(sk_make_sp(SK_Scalar1*2, lattice)); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); - - p.setPathEffect(nullptr); - p.setBlendMode(SkBlendMode::kSrcOver); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1); - rastBuilder->addLayer(p); -} - -static void r9(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - rastBuilder->addLayer(p); - - SkMatrix lattice; - lattice.setScale(SK_Scalar1, SK_Scalar1*6, 0, 0); - lattice.postRotate(SkIntToScalar(30), 0, 0); - p.setPathEffect(SkLine2DPathEffect::Make(SK_Scalar1*2, lattice)); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); - - p.setPathEffect(nullptr); - p.setBlendMode(SkBlendMode::kSrcOver); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1); - rastBuilder->addLayer(p); -} - -typedef void (*raster_proc)(SkLayerRasterizer::Builder*, SkPaint&); - -static const raster_proc gRastProcs[] = { - r0, r1, r2, r3, r4, r5, r6, r7, r8, r9 -}; - -static const struct { - SkColor fMul, fAdd; -} gLightingColors[] = { - { 0x808080, 0x800000 }, // general case - { 0x707070, 0x707070 }, // no-pin case - { 0xFFFFFF, 0x800000 }, // just-add case - { 0x808080, 0x000000 }, // just-mul case - { 0xFFFFFF, 0x000000 } // identity case -}; - -static void apply_shader(SkPaint* paint, int index) { - raster_proc proc = gRastProcs[index]; - if (proc) { - SkPaint p; - SkLayerRasterizer::Builder rastBuilder; - - p.setAntiAlias(true); - proc(&rastBuilder, p); - paint->setRasterizer(rastBuilder.detach()); - } - - paint->setMaskFilter(SkEmbossMaskFilter::Make( - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), - { { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 128, 16*2 })); - paint->setColor(SK_ColorBLUE); -} - class DemoView : public SampleView { public: DemoView() {} @@ -469,49 +313,6 @@ protected: decode_file("/Users/caryclark/Desktop/05psp04.gif", &fTx); } - void drawRaster(SkCanvas* canvas) { - for (size_t index = 0; index < SK_ARRAY_COUNT(gRastProcs); index++) - drawOneRaster(canvas); - } - - void drawOneRaster(SkCanvas* canvas) { - canvas->save(); - - SkScalar x = SkIntToScalar(20); - SkScalar y = SkIntToScalar(40); - SkPaint paint; - - paint.setAntiAlias(true); - paint.setTextSize(SkIntToScalar(48)); - paint.setTypeface(SkTypeface::MakeFromName("sans-serif", SkFontStyle::Bold())); - - SkString str("GOOGLE"); - - for (size_t i = 0; i < SK_ARRAY_COUNT(gRastProcs); i++) { - apply_shader(&paint, (int)i); - - // paint.setMaskFilter(nullptr); - // paint.setColor(SK_ColorBLACK); - -#if 01 - int index = i % SK_ARRAY_COUNT(gLightingColors); - paint.setColorFilter(SkColorMatrixFilter::MakeLightingFilter( - gLightingColors[index].fMul, - gLightingColors[index].fAdd)); -#endif - - canvas->drawString(str, x, y, paint); - SkRect oval = { x, y - SkIntToScalar(40), x + SkIntToScalar(40), y }; - paint.setStyle(SkPaint::kStroke_Style); - canvas->drawOval(oval, paint); - paint.setStyle(SkPaint::kFill_Style); - - y += paint.getFontSpacing(); - } - - canvas->restore(); - } - private: SkPoint fClickPt; SkBitmap fBug, fTb, fTx; diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index b3b1cfefaf..a461a22aa9 100644 --- a/samplecode/SampleArc.cpp +++ b/samplecode/SampleArc.cpp @@ -13,7 +13,6 @@ #include "SkCornerPathEffect.h" #include "SkDrawable.h" #include "SkGradientShader.h" -#include "SkLayerRasterizer.h" #include "SkPath.h" #include "SkPathMeasure.h" #include "SkPictureRecorder.h" diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 40dc87f4c6..21e491494d 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -24,7 +24,6 @@ #include "SkEmbossMaskFilter.h" #include "SkFlattenableSerialization.h" #include "SkImageSource.h" -#include "SkLayerRasterizer.h" #include "SkLightingImageFilter.h" #include "SkLumaColorFilter.h" #include "SkMagnifierImageFilter.h" @@ -512,13 +511,6 @@ static SkPaint make_paint() { make_typeface_style())); } - SkLayerRasterizer::Builder rasterizerBuilder; - SkPaint paintForRasterizer; - if (R(2) == 1) { - paintForRasterizer = make_paint(); - } - rasterizerBuilder.addLayer(paintForRasterizer); - paint.setRasterizer(rasterizerBuilder.detach()); paint.setImageFilter(make_image_filter()); sk_sp 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 3d9ba9cb36..5d80e5a08d 100644 --- a/samplecode/SamplePathEffects.cpp +++ b/samplecode/SamplePathEffects.cpp @@ -67,21 +67,6 @@ static sk_sp make_warp_pe(SkScalar phase) { /////////////////////////////////////////////////////////// #include "SkColorFilter.h" -#include "SkLayerRasterizer.h" - -class TestRastBuilder : public SkLayerRasterizer::Builder { -public: - TestRastBuilder() { - SkPaint paint; - paint.setAntiAlias(true); - - paint.setAlpha(0x66); - this->addLayer(paint, SkIntToScalar(4), SkIntToScalar(4)); - - paint.setAlpha(0xFF); - this->addLayer(paint); - } -}; class PathEffectView : public SampleView { SkPath fPath; @@ -151,8 +136,6 @@ protected: paint.setARGB(0xFF, 0, 0, 0); paint.setPathEffect(make_warp_pe(fPhase)); - TestRastBuilder testRastBuilder; - paint.setRasterizer(testRastBuilder.detach()); canvas->drawPath(fPath, paint); } diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index 5c6fb79624..998896c9ec 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -11,7 +11,6 @@ #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkGradientShader.h" -#include "SkLayerRasterizer.h" #include "SkPaint.h" #include "SkVertices.h" #include "SkView.h" @@ -458,187 +457,8 @@ static void mesh_slide(SkCanvas* canvas) { /////////////////////////////////////////////////////////////////////////////// -static void r0(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - p.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(3))); - rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); - - p.setMaskFilter(nullptr); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1); - rastBuilder->addLayer(p); - - p.setAlpha(0x11); - p.setStyle(SkPaint::kFill_Style); - p.setBlendMode(SkBlendMode::kSrc); - rastBuilder->addLayer(p); -} - -static void r1(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - rastBuilder->addLayer(p); - - p.setAlpha(0x40); - p.setBlendMode(SkBlendMode::kSrc); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1*2); - rastBuilder->addLayer(p); -} - -static void r2(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - p.setStyle(SkPaint::kStrokeAndFill_Style); - p.setStrokeWidth(SK_Scalar1*4); - rastBuilder->addLayer(p); - - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1*3/2); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); -} - -static void r3(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1*3); - rastBuilder->addLayer(p); - - p.setAlpha(0x20); - p.setStyle(SkPaint::kFill_Style); - p.setBlendMode(SkBlendMode::kSrc); - rastBuilder->addLayer(p); -} - -static void r4(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - p.setAlpha(0x60); - rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); - - p.setAlpha(0xFF); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p, SK_Scalar1*3/2, SK_Scalar1*3/2); - - p.setBlendMode(SkBlendMode::kSrcOver); - rastBuilder->addLayer(p); -} - -#include "SkDiscretePathEffect.h" - -static void r5(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - rastBuilder->addLayer(p); - - p.setPathEffect(SkDiscretePathEffect::Make(SK_Scalar1*4, SK_Scalar1*3)); - p.setBlendMode(SkBlendMode::kSrcOut); - rastBuilder->addLayer(p); -} - -static void r6(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - rastBuilder->addLayer(p); - - p.setAntiAlias(false); - SkLayerRasterizer::Builder rastBuilder2; - r5(&rastBuilder2, p); - p.setRasterizer(rastBuilder2.detach()); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); -} - -#include "Sk2DPathEffect.h" - -static sk_sp MakeDotEffect(SkScalar radius, const SkMatrix& matrix) { - SkPath path; - path.addCircle(0, 0, radius); - return SkPath2DPathEffect::Make(matrix, path); -} - -static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - SkMatrix lattice; - lattice.setScale(SK_Scalar1*6, SK_Scalar1*6, 0, 0); - lattice.postSkew(SK_Scalar1/3, 0, 0, 0); - p.setPathEffect(MakeDotEffect(SK_Scalar1*4, lattice)); - rastBuilder->addLayer(p); -} - -static void r8(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - rastBuilder->addLayer(p); - - SkMatrix lattice; - lattice.setScale(SK_Scalar1*6, SK_Scalar1*6, 0, 0); - lattice.postSkew(SK_Scalar1/3, 0, 0, 0); - p.setPathEffect(MakeDotEffect(SK_Scalar1*2, lattice)); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); - - p.setPathEffect(nullptr); - p.setBlendMode(SkBlendMode::kSrcOver); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1); - rastBuilder->addLayer(p); -} - -static void r9(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) -{ - rastBuilder->addLayer(p); - - SkMatrix lattice; - lattice.setScale(SK_Scalar1, SK_Scalar1*6, 0, 0); - lattice.postRotate(SkIntToScalar(30), 0, 0); - p.setPathEffect(SkLine2DPathEffect::Make(SK_Scalar1*2, lattice)); - p.setBlendMode(SkBlendMode::kClear); - rastBuilder->addLayer(p); - - p.setPathEffect(nullptr); - p.setBlendMode(SkBlendMode::kSrcOver); - p.setStyle(SkPaint::kStroke_Style); - p.setStrokeWidth(SK_Scalar1); - rastBuilder->addLayer(p); -} - -typedef void (*raster_proc)(SkLayerRasterizer::Builder*, SkPaint&); - -static const raster_proc gRastProcs[] = { - r0, r1, r2, r3, r4, r5, r6, r7, r8, r9 -}; - -static void apply_shader(SkPaint* paint, int index) { - raster_proc proc = gRastProcs[index]; - SkPaint p; - SkLayerRasterizer::Builder rastBuilder; - - p.setAntiAlias(true); - proc(&rastBuilder, p); - paint->setRasterizer(rastBuilder.detach()); - paint->setColor(SK_ColorBLUE); -} - #include "SkTypeface.h" -static void texteffect_slide(SkCanvas* canvas) { - const char* str = "Google"; - size_t len = strlen(str); - SkScalar x = 20; - SkScalar y = 80; - SkPaint paint; - paint.setTypeface(SkTypeface::MakeFromName("Georgia", SkFontStyle::Italic())); - paint.setTextSize(75); - paint.setAntiAlias(true); - paint.setColor(SK_ColorBLUE); - for (size_t i = 0; i < SK_ARRAY_COUNT(gRastProcs); i++) { - apply_shader(&paint, (int)i); - canvas->drawText(str, len, x, y, paint); - y += 80; - if (i == 4) { - x += 320; - y = 80; - } - } -} - /////////////////////////////////////////////////////////////////////////////// #include "SkImageEncoder.h" @@ -648,7 +468,6 @@ static const SlideProc gProc[] = { gradient_slide, textonpath_slide, mesh_slide, - texteffect_slide }; class SlideView : public SampleView { -- cgit v1.2.3