| Index: src/core/SkXfermode.cpp
|
| diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
|
| index cf4f19f4485079c250cdd9f2a41b41e9f3c62992..4b15af0a87f6835b5fe2a3da93894ae00dadb547 100644
|
| --- a/src/core/SkXfermode.cpp
|
| +++ b/src/core/SkXfermode.cpp
|
| @@ -793,7 +793,7 @@ public:
|
| return mode > SkXfermode::kLastCoeffMode && mode <= SkXfermode::kLastMode;
|
| }
|
|
|
| - static GrEffectRef* Create(SkXfermode::Mode mode, GrTexture* background) {
|
| + static GrEffect* Create(SkXfermode::Mode mode, GrTexture* background) {
|
| if (!IsSupportedMode(mode)) {
|
| return NULL;
|
| } else {
|
| @@ -1223,10 +1223,10 @@ private:
|
| };
|
|
|
| GR_DEFINE_EFFECT_TEST(XferEffect);
|
| -GrEffectRef* XferEffect::TestCreate(SkRandom* rand,
|
| - GrContext*,
|
| - const GrDrawTargetCaps&,
|
| - GrTexture*[]) {
|
| +GrEffect* XferEffect::TestCreate(SkRandom* rand,
|
| + GrContext*,
|
| + const GrDrawTargetCaps&,
|
| + GrTexture*[]) {
|
| int mode = rand->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
|
|
|
| return SkNEW_ARGS(XferEffect, (static_cast<SkXfermode::Mode>(mode), NULL));
|
| @@ -1361,8 +1361,7 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -bool SkProcCoeffXfermode::asNewEffect(GrEffectRef** effect,
|
| - GrTexture* background) const {
|
| +bool SkProcCoeffXfermode::asNewEffect(GrEffect** effect, GrTexture* background) const {
|
| if (XferEffect::IsSupportedMode(fMode)) {
|
| if (NULL != effect) {
|
| *effect = XferEffect::Create(fMode, background);
|
|
|