Index: src/effects/SkDisplacementMapEffect.cpp |
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp |
index 44c3908779a5e9fa7b16b44512f78a6a3f255422..01848e61bf0ad05c5eed246c333334cb71a2347e 100644 |
--- a/src/effects/SkDisplacementMapEffect.cpp |
+++ b/src/effects/SkDisplacementMapEffect.cpp |
@@ -300,11 +300,11 @@ private: |
class GrDisplacementMapEffect : public GrEffect { |
public: |
- static GrEffectRef* Create(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, |
- SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, |
- SkVector scale, |
- GrTexture* displacement, const SkMatrix& offsetMatrix, |
- GrTexture* color) { |
+ static GrEffect* Create(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector, |
+ SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, |
+ SkVector scale, |
+ GrTexture* displacement, const SkMatrix& offsetMatrix, |
+ GrTexture* color) { |
return SkNEW_ARGS(GrDisplacementMapEffect, (xChannelSelector, |
yChannelSelector, |
scale, |
@@ -476,10 +476,10 @@ void GrDisplacementMapEffect::getConstantColorComponents(GrColor*, |
GR_DEFINE_EFFECT_TEST(GrDisplacementMapEffect); |
-GrEffectRef* GrDisplacementMapEffect::TestCreate(SkRandom* random, |
- GrContext*, |
- const GrDrawTargetCaps&, |
- GrTexture* textures[]) { |
+GrEffect* GrDisplacementMapEffect::TestCreate(SkRandom* random, |
+ GrContext*, |
+ const GrDrawTargetCaps&, |
+ GrTexture* textures[]) { |
int texIdxDispl = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : |
GrEffectUnitTest::kAlphaTextureIdx; |
int texIdxColor = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : |