diff options
author | Mike Reed <reed@google.com> | 2016-11-03 14:45:31 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 19:54:08 +0000 |
commit | faba3715b8ddfaa0ce4df79bc8006e9bc7694e5b (patch) | |
tree | 7d12df48b54ebdb69209e784872831f32abbe30f /gm | |
parent | 8b1fb741f196b78479b9d5bb2b33875aaa9709bb (diff) |
remove unused code around SK_SUPPORT_LEGACY_XFERMODE_PARAM
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4384
Change-Id: I5121acd027d935ade169ff65941f29f654a47bd0
Reviewed-on: https://skia-review.googlesource.com/4384
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/blurroundrect.cpp | 2 | ||||
-rw-r--r-- | gm/drawlooper.cpp | 2 | ||||
-rw-r--r-- | gm/megalooper.cpp | 4 | ||||
-rw-r--r-- | gm/textbloblooper.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index 8e5b89dd70..80bf6cce8a 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -51,7 +51,7 @@ public: SkLayerDrawLooper::LayerInfo info; info.fPaintBits = SkLayerDrawLooper::kMaskFilter_Bit | SkLayerDrawLooper::kColorFilter_Bit; - info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kSrc; + info.fColorMode = SkBlendMode::kSrc; info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; SkPaint* paint = looperBuilder.addLayerOnTop(info); diff --git a/gm/drawlooper.cpp b/gm/drawlooper.cpp index 8275939cc5..676e01aef6 100644 --- a/gm/drawlooper.cpp +++ b/gm/drawlooper.cpp @@ -73,7 +73,7 @@ private: SkLayerDrawLooper::LayerInfo info; info.fPaintBits = SkLayerDrawLooper::kStyle_Bit | SkLayerDrawLooper::kMaskFilter_Bit; - info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kSrc; + info.fColorMode = SkBlendMode::kSrc; for (size_t i = 0; i < SK_ARRAY_COUNT(gParams); i++) { info.fOffset.set(gParams[i].fOffset, gParams[i].fOffset); diff --git a/gm/megalooper.cpp b/gm/megalooper.cpp index fd8757b8b6..f5077c02a4 100644 --- a/gm/megalooper.cpp +++ b/gm/megalooper.cpp @@ -167,7 +167,7 @@ private: info.fPaintBits = SkLayerDrawLooper::kColorFilter_Bit | SkLayerDrawLooper::kMaskFilter_Bit; - info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kSrc; + info.fColorMode = SkBlendMode::kSrc; info.fOffset.set(xOff, yOff); info.fPostTranslate = false; @@ -210,7 +210,7 @@ private: info.fPaintBits = SkLayerDrawLooper::kColorFilter_Bit | SkLayerDrawLooper::kMaskFilter_Bit; - info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kSrc; + info.fColorMode = SkBlendMode::kSrc; info.fPostTranslate = false; SkPaint* paint; diff --git a/gm/textbloblooper.cpp b/gm/textbloblooper.cpp index 29f975613c..d0e55086c9 100644 --- a/gm/textbloblooper.cpp +++ b/gm/textbloblooper.cpp @@ -115,7 +115,7 @@ static sk_sp<SkDrawLooper> setupLooper(SkLayerDrawLooper::BitFlags bits, SkLayerDrawLooper::LayerInfo info; info.fPaintBits = bits; - info.fColorMode = (SK_XFERMODE_MODE_PARAM)SkBlendMode::kSrc; + info.fColorMode = SkBlendMode::kSrc; for (size_t i = 0; i < size; i++) { info.fOffset.set(settings[i].fOffset, settings[i].fOffset); |