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>
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index f334570..50a7804 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -30,7 +30,6 @@
class SkPath;
class SkPathEffect;
struct SkPoint;
-class SkRasterizer;
struct SkScalerContextEffects;
class SkShader;
class SkSurfaceProps;
@@ -74,11 +73,11 @@
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 @@
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 @@
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 @@
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 @@
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 @@
*/
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 @@
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 @@
sk_sp<SkShader> fShader;
sk_sp<SkMaskFilter> fMaskFilter;
sk_sp<SkColorFilter> fColorFilter;
- sk_sp<SkRasterizer> fRasterizer;
sk_sp<SkDrawLooper> fDrawLooper;
sk_sp<SkImageFilter> fImageFilter;