remove lots of legacy flags
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4209
Change-Id: I49ae36a9b2bb51a6470638d3264923ff4a4dea0a
Reviewed-on: https://skia-review.googlesource.com/4209
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 2e4f2f9..353c147 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -14,8 +14,6 @@
#include "SkMatrix.h"
#include "SkXfermode.h"
-//#define SK_SUPPORT_LEGACY_XFERMODE_OBJECT
-
class SkAutoDescriptor;
class SkAutoGlyphCache;
class SkColorFilter;
@@ -520,32 +518,6 @@
*/
void setColorFilter(sk_sp<SkColorFilter>);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_OBJECT
- /** Get the paint's xfermode object.
- <p />
- The xfermode's reference count is not affected.
- @return the paint's xfermode (or NULL)
- */
- SkXfermode* getXfermode() const;
-
- /** Set or clear the xfermode object.
- <p />
- Pass NULL to clear any previous xfermode.
- As a convenience, the parameter passed is also returned.
- If a previous xfermode exists, its reference count is decremented.
- If xfermode is not NULL, its reference count is incremented.
- @param xfermode May be NULL. The new xfermode to be installed in the
- paint
- */
- void setXfermode(sk_sp<SkXfermode>);
-
- /** Create an xfermode based on the specified Mode, and assign it into the
- paint, returning the mode that was set. If the Mode is SrcOver, then
- the paint's xfermode is set to null.
- */
- SkXfermode* setXfermodeMode(SkXfermode::Mode);
-#endif
-
SkBlendMode getBlendMode() const { return (SkBlendMode)fBlendMode; }
bool isSrcOver() const { return (SkBlendMode)fBlendMode == SkBlendMode::kSrcOver; }
void setBlendMode(SkBlendMode mode) { fBlendMode = (unsigned)mode; }
@@ -568,9 +540,6 @@
@return effect
*/
void setPathEffect(sk_sp<SkPathEffect>);
-#ifdef SK_SUPPORT_LEGACY_PATHEFFECT_PTR
- SkPathEffect* setPathEffect(SkPathEffect* effect);
-#endif
/** Get the paint's maskfilter object.
<p />
@@ -589,9 +558,6 @@
the paint
@return maskfilter
*/
-#ifdef SK_SUPPORT_LEGACY_MASKFILTER_PTR
- SkMaskFilter* setMaskFilter(SkMaskFilter* maskfilter);
-#endif
void setMaskFilter(sk_sp<SkMaskFilter>);
// These attributes are for text/fonts
@@ -615,9 +581,6 @@
@return typeface
*/
void setTypeface(sk_sp<SkTypeface>);
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
- SkTypeface* setTypeface(SkTypeface* typeface);
-#endif
/** Get the paint's rasterizer (or NULL).
<p />
@@ -637,9 +600,6 @@
the paint.
@return rasterizer
*/
-#ifdef SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR
- SkRasterizer* setRasterizer(SkRasterizer* rasterizer);
-#endif
void setRasterizer(sk_sp<SkRasterizer>);
SkImageFilter* getImageFilter() const { return fImageFilter.get(); }
@@ -662,9 +622,7 @@
* @param looper May be NULL. The new looper to be installed in the paint.
*/
void setDrawLooper(sk_sp<SkDrawLooper>);
-#ifdef SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR
- SkDrawLooper* setLooper(SkDrawLooper* looper);
-#endif
+
void setLooper(sk_sp<SkDrawLooper>);
enum Align {