aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkMergeImageFilter.h
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-11-18 17:19:54 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-22 15:22:00 +0000
commit71fecc32b1b4f71ef3c6467b1f5e0b55c2a12428 (patch)
treec5c94b1d7beb937466e7a7e17d4f2f8507ce2442 /include/effects/SkMergeImageFilter.h
parent1fc83b131afa7c29e971dd3ccc7906006bde6c09 (diff)
don't memtion SkXfermode in public
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5070 Change-Id: Ia9527bfd0f13146669df5e71098af903e14bae3a Reviewed-on: https://skia-review.googlesource.com/5070 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
-rw-r--r--include/effects/SkMergeImageFilter.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index a89e690e89..f4cd4134d5 100644
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -8,10 +8,9 @@
#ifndef SkMergeImageFilter_DEFINED
#define SkMergeImageFilter_DEFINED
+#include "SkBlendMode.h"
#include "SkImageFilter.h"
-#include "SkXfermode.h"
-
class SK_API SkMergeImageFilter : public SkImageFilter {
public:
~SkMergeImageFilter() override;
@@ -34,7 +33,7 @@ private:
SkMergeImageFilter(sk_sp<SkImageFilter> filters[], int count, const SkBlendMode modes[],
const CropRect* cropRect);
- uint8_t* fModes; // SkXfermode::Mode
+ uint8_t* fModes; // SkBlendMode
// private storage, to avoid dynamically allocating storage for our copy
// of the modes (unless the count is so large we can't fit).