diff options
author | Mike Reed <reed@google.com> | 2017-06-10 11:08:53 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-10 15:29:24 +0000 |
commit | 8d3f4433d888e88ee09d53749936a45c22a14194 (patch) | |
tree | 42eff25ef2fe59170ee7e6ae43dc821a9c57e682 /src/core/SkXfermodePriv.h | |
parent | f449ded72acf90c1d68a9492bc627a16e709591d (diff) |
SkXfermode no longer needs to e a flattenable
SkArithmeticMode is unreachable, so delete it
Bug: skia:
Change-Id: Ibe4c48fcf756280569c4b302da8d96bd4e21b717
Reviewed-on: https://skia-review.googlesource.com/19394
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkXfermodePriv.h')
-rw-r--r-- | src/core/SkXfermodePriv.h | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/src/core/SkXfermodePriv.h b/src/core/SkXfermodePriv.h index baed483dad..bca627efe8 100644 --- a/src/core/SkXfermodePriv.h +++ b/src/core/SkXfermodePriv.h @@ -10,7 +10,7 @@ #include "SkBlendMode.h" #include "SkColor.h" -#include "SkFlattenable.h" +#include "SkRefCnt.h" class GrFragmentProcessor; class GrTexture; @@ -18,23 +18,7 @@ class GrXPFactory; class SkRasterPipeline; class SkString; -struct SkArithmeticParams; - -struct SkPM4f; -typedef SkPM4f (*SkXfermodeProc4f)(const SkPM4f& src, const SkPM4f& dst); - -/** \class SkXfermode - * - * SkXfermode is the base class for objects that are called to implement custom - * "transfer-modes" in the drawing pipeline. The static function Create(Modes) - * can be called to return an instance of any of the predefined subclasses as - * specified in the Modes enum. When an SkXfermode is assigned to an SkPaint, - * then objects drawn with that paint have the xfermode applied. - * - * All subclasses are required to be reentrant-safe : it must be legal to share - * the same instance between several threads. - */ -class SK_API SkXfermode : public SkFlattenable { +class SkXfermode : public SkRefCnt { public: virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const = 0; @@ -103,16 +87,11 @@ public: virtual const GrXPFactory* asXPFactory() const; #endif - SK_TO_STRING_PUREVIRT() - SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() - SK_DEFINE_FLATTENABLE_TYPE(SkXfermode) - protected: SkXfermode() {} + virtual ~SkXfermode() {} private: - - typedef SkFlattenable INHERITED; }; #endif |