remove unused SkRasterizer

Bug: skia:7500
Change-Id: Iaa683cf8f0b18887cce4ec676631d1e1efee1712
Reviewed-on: https://skia-review.googlesource.com/97400
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

5 files changed, 18 insertions, 179 deletions

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 3f0128a655..0c7bfece80 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1098,7 +1098,7 @@ public:
     */
     void discard() { this->onDiscard(); }
 
-    /** Fill clip with SkPaint paint. SkPaint components SkRasterizer, SkMaskFilter, SkShader,
+    /** Fill clip with SkPaint paint. SkPaint components SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkBlendMode affect drawing;
         SkPathEffect in paint is ignored.
 
@@ -1890,7 +1890,7 @@ public:
         text draws left to right, positioning the first glyph left side bearing at x
         and its baseline at y. Text size is affected by SkMatrix and SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -1914,7 +1914,7 @@ public:
         string draws left to right, positioning the first glyph left side bearing at x
         and its baseline at y. Text size is affected by SkMatrix and SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -1942,7 +1942,7 @@ public:
         string draws left to right, positioning the first glyph left side bearing at x
         and its baseline at y. Text size is affected by SkMatrix and SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -1964,7 +1964,7 @@ public:
         baseline is positioned at y. Text size is affected by SkMatrix and
         SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -1989,7 +1989,7 @@ public:
         its baseline is positioned at constY. Text size is affected by SkMatrix and
         SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -2019,7 +2019,7 @@ public:
         default text positions the first glyph left side bearing at origin x and its
         baseline at origin y. Text size is affected by SkMatrix and SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -2046,7 +2046,7 @@ public:
         default text positions the first glyph left side bearing at origin x and its
         baseline at origin y. Text size is affected by SkMatrix and SkPaint text size.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -2069,7 +2069,7 @@ public:
         Optional SkRect cullRect is a conservative bounds of text, taking into account
         SkRSXform and paint. If cullRect is outside of clip, canvas can skip drawing.
 
-        All elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader,
+        All elements of paint: SkPathEffect, SkMaskFilter, SkShader,
         SkColorFilter, SkImageFilter, and SkDrawLooper; apply to text. By default, draws
         filled 12 point black glyphs.
 
@@ -2092,7 +2092,7 @@ public:
 
         SkPaint::TextEncoding must be set to SkPaint::kGlyphID_TextEncoding.
 
-        Elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader, SkColorFilter,
+        Elements of paint: SkPathEffect, SkMaskFilter, SkShader, SkColorFilter,
         SkImageFilter, and SkDrawLooper; apply to blob.
 
         @param blob   glyphs, positions, and their paints' text size, typeface, and so on
@@ -2112,7 +2112,7 @@ public:
 
         SkPaint::TextEncoding must be set to SkPaint::kGlyphID_TextEncoding.
 
-        Elements of paint: SkPathEffect, SkRasterizer, SkMaskFilter, SkShader, SkColorFilter,
+        Elements of paint: SkPathEffect, SkMaskFilter, SkShader, SkColorFilter,
         SkImageFilter, and SkDrawLooper; apply to blob.
 
         @param blob   glyphs, positions, and their paints' text size, typeface, and so on
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index cfeda8fe6c..05b8fba9a7 100644
--- a/include/core/SkFlattenable.h
+++ b/include/core/SkFlattenable.h
@@ -88,7 +88,7 @@ public:
         kSkMaskFilter_Type,
         kSkPathEffect_Type,
         kSkPixelRef_Type,
-        kSkRasterizer_Type,
+        kSkUnused_Type4,    // used to be SkRasterizer
         kSkShaderBase_Type,
         kSkUnused_Type,     // used to be SkUnitMapper
         kSkUnused_Type2,
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index f334570a00..50a7804508 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -30,7 +30,6 @@ class SkMaskFilter;
 class SkPath;
 class SkPathEffect;
 struct SkPoint;
-class SkRasterizer;
 struct SkScalerContextEffects;
 class SkShader;
 class SkSurfaceProps;
@@ -74,11 +73,11 @@ public:
     SkPaint();
 
     /** Makes a shallow copy of SkPaint. SkTypeface, SkPathEffect, SkShader,
-        SkMaskFilter, SkColorFilter, SkRasterizer, SkDrawLooper, and SkImageFilter are shared
+        SkMaskFilter, SkColorFilter, SkDrawLooper, and SkImageFilter are shared
         between the original paint and the copy. Objects containing SkRefCnt increment
         their references by one.
 
-        The referenced objects SkPathEffect, SkShader, SkMaskFilter, SkColorFilter, SkRasterizer,
+        The referenced objects SkPathEffect, SkShader, SkMaskFilter, SkColorFilter,
         SkDrawLooper, and SkImageFilter cannot be modified after they are created.
         This prevents objects with SkRefCnt from being modified once SkPaint refers to them.
 
@@ -98,13 +97,13 @@ public:
     SkPaint(SkPaint&& paint);
 
     /** Decreases SkPaint SkRefCnt of owned objects: SkTypeface, SkPathEffect, SkShader,
-        SkMaskFilter, SkColorFilter, SkRasterizer, SkDrawLooper, and SkImageFilter. If the
+        SkMaskFilter, SkColorFilter, SkDrawLooper, and SkImageFilter. If the
         objects containing SkRefCnt go to zero, they are deleted.
     */
     ~SkPaint();
 
     /** Makes a shallow copy of SkPaint. SkTypeface, SkPathEffect, SkShader,
-        SkMaskFilter, SkColorFilter, SkRasterizer, SkDrawLooper, and SkImageFilter are shared
+        SkMaskFilter, SkColorFilter, SkDrawLooper, and SkImageFilter are shared
         between the original paint and the copy. Objects containing SkRefCnt in the
         prior destination are decreased by one, and the referenced objects are deleted if the
         resulting count is zero. Objects containing SkRefCnt in the parameter paint
@@ -128,7 +127,7 @@ public:
     SkPaint& operator=(SkPaint&& paint);
 
     /** Compares a and b, and returns true if a and b are equivalent. May return false
-        if SkTypeface, SkPathEffect, SkShader, SkMaskFilter, SkColorFilter, SkRasterizer,
+        if SkTypeface, SkPathEffect, SkShader, SkMaskFilter, SkColorFilter,
         SkDrawLooper, or SkImageFilter have identical contents but different pointers.
 
         @param a  SkPaint to compare
@@ -138,7 +137,7 @@ public:
     SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
 
     /** Compares a and b, and returns true if a and b are not equivalent. May return true
-        if SkTypeface, SkPathEffect, SkShader, SkMaskFilter, SkColorFilter, SkRasterizer,
+        if SkTypeface, SkPathEffect, SkShader, SkMaskFilter, SkColorFilter,
         SkDrawLooper, or SkImageFilter have identical contents but different pointers.
 
         @param a  SkPaint to compare
@@ -854,9 +853,6 @@ public:
         SkMaskFilter. Pass nullptr to clear SkMaskFilter and leave SkMaskFilter effect on
         mask alpha unaltered.
 
-        Does not affect SkRasterizer.
-        Increments maskFilter SkRefCnt by one.
-
         @param maskFilter  modifies clipping mask generated from drawn geometry
     */
     void setMaskFilter(sk_sp<SkMaskFilter> maskFilter);
@@ -882,31 +878,6 @@ public:
     */
     void setTypeface(sk_sp<SkTypeface> typeface);
 
-    /** Returns SkRasterizer if set, or nullptr.
-        Does not alter SkRasterizer SkRefCnt.
-
-        @return  SkRasterizer if previously set, nullptr otherwise
-    */
-    SkRasterizer* getRasterizer() const { return fRasterizer.get(); }
-
-    /** Returns SkRasterizer if set, or nullptr.
-        Increases SkRasterizer SkRefCnt by one.
-
-        @return  SkRasterizer if previously set, nullptr otherwise
-    */
-    sk_sp<SkRasterizer> refRasterizer() const;
-
-    /** Sets SkRasterizer to rasterizer, decreasing SkRefCnt of the previous
-        SkRasterizer. Pass nullptr to clear SkRasterizer and leave SkRasterizer effect on
-        mask alpha unaltered.
-
-        Does not affect SkMaskFilter.
-        Increments rasterizer SkRefCnt by one.
-
-        @param rasterizer  how geometry is converted to mask alpha
-    */
-    void setRasterizer(sk_sp<SkRasterizer> rasterizer);
-
     /** Returns SkImageFilter if set, or nullptr.
         Does not alter SkImageFilter SkRefCnt.
 
@@ -925,9 +896,6 @@ public:
         SkImageFilter. Pass nullptr to clear SkImageFilter, and remove SkImageFilter effect
         on drawing.
 
-        Does not affect SkRasterizer or SkMaskFilter.
-        Increments imageFilter SkRefCnt by one.
-
         @param imageFilter  how SkImage is sampled when transformed
     */
     void setImageFilter(sk_sp<SkImageFilter> imageFilter);
@@ -1678,7 +1646,6 @@ private:
     sk_sp<SkShader>       fShader;
     sk_sp<SkMaskFilter>   fMaskFilter;
     sk_sp<SkColorFilter>  fColorFilter;
-    sk_sp<SkRasterizer>   fRasterizer;
     sk_sp<SkDrawLooper>   fDrawLooper;
     sk_sp<SkImageFilter>  fImageFilter;
 
diff --git a/include/core/SkRasterizer.h b/include/core/SkRasterizer.h
deleted file mode 100644
index 1881ccef24..0000000000
--- a/include/core/SkRasterizer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkRasterizer_DEFINED
-#define SkRasterizer_DEFINED
-
-#include "SkFlattenable.h"
-#include "SkMask.h"
-
-class SkMaskFilter;
-class SkMatrix;
-class SkPath;
-struct SkIRect;
-
-class SK_API SkRasterizer : public SkFlattenable {
-public:
-    /** Turn the path into a mask, respecting the specified local->device matrix.
-    */
-    bool rasterize(const SkPath& path, const SkMatrix& matrix,
-                   const SkIRect* clipBounds, SkMaskFilter* filter,
-                   SkMask* mask, SkMask::CreateMode mode) const;
-
-    SK_DEFINE_FLATTENABLE_TYPE(SkRasterizer)
-
-protected:
-    SkRasterizer() {}
-    virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
-                             const SkIRect* clipBounds,
-                             SkMask* mask, SkMask::CreateMode mode) const;
-
-private:
-    typedef SkFlattenable INHERITED;
-};
-
-#endif
diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h
deleted file mode 100644
index cd48602357..0000000000
--- a/include/effects/SkLayerRasterizer.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkLayerRasterizer_DEFINED
-#define SkLayerRasterizer_DEFINED
-
-#include "SkRasterizer.h"
-#include "SkDeque.h"
-#include "SkScalar.h"
-
-class SkPaint;
-
-class SK_API SkLayerRasterizer : public SkRasterizer {
-public:
-    ~SkLayerRasterizer() override;
-
-    class SK_API Builder {
-    public:
-        Builder();
-        ~Builder();
-
-        void addLayer(const SkPaint& paint) {
-            this->addLayer(paint, 0, 0);
-        }
-
-        /**
-          *  Add a new layer (above any previous layers) to the rasterizer.
-          *  The layer will extract those fields that affect the mask from
-          *  the specified paint, but will not retain a reference to the paint
-          *  object itself, so it may be reused without danger of side-effects.
-          */
-        void addLayer(const SkPaint& paint, SkScalar dx, SkScalar dy);
-
-        /**
-          *  Pass queue of layers on to newly created layer rasterizer and return it. The builder
-          *  *cannot* be used any more after calling this function. If no layers have been added,
-          *  returns NULL.
-          *
-          *  The caller is responsible for calling unref() on the returned object, if non NULL.
-          */
-        sk_sp<SkLayerRasterizer> detach();
-
-        /**
-          *  Create and return a new immutable SkLayerRasterizer that contains a shapshot of the
-          *  layers that were added to the Builder, without modifying the Builder. The Builder
-          *  *may* be used after calling this function. It will continue to hold any layers
-          *  previously added, so consecutive calls to this function will return identical objects,
-          *  and objects returned by future calls to this function contain all the layers in
-          *  previously returned objects. If no layers have been added, returns NULL.
-          *
-          *  Future calls to addLayer will not affect rasterizers previously returned by this call.
-          *
-          *  The caller is responsible for calling unref() on the returned object, if non NULL.
-          */
-        sk_sp<SkLayerRasterizer> snapshot() const;
-
-    private:
-        SkDeque* fLayers;
-    };
-
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerRasterizer)
-
-protected:
-    SkLayerRasterizer();
-    SkLayerRasterizer(SkDeque* layers);
-    void flatten(SkWriteBuffer&) const override;
-
-    // override from SkRasterizer
-    virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
-                             const SkIRect* clipBounds,
-                             SkMask* mask, SkMask::CreateMode mode) const override;
-
-private:
-    const SkDeque* const fLayers;
-
-    static SkDeque* ReadLayers(SkReadBuffer& buffer);
-
-    friend class LayerRasterizerTester;
-
-    typedef SkRasterizer INHERITED;
-};
-
-#endif