| Index: src/gpu/effects/GrDistanceFieldTextureEffect.h
|
| diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h
|
| index b2e21b28955ea6156250625b52f036a0cfed9492..38e41e5590d6d801304cdc3d5d37a6895b8907e6 100644
|
| --- a/src/gpu/effects/GrDistanceFieldTextureEffect.h
|
| +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h
|
| @@ -23,15 +23,15 @@ class GrGLDistanceFieldLCDTextureEffect;
|
| class GrDistanceFieldTextureEffect : public GrVertexEffect {
|
| public:
|
| #ifdef SK_GAMMA_APPLY_TO_A8
|
| - static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& params,
|
| - GrTexture* gamma, const GrTextureParams& gammaParams, float lum,
|
| - bool similarity) {
|
| + static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,
|
| + GrTexture* gamma, const GrTextureParams& gammaParams, float lum,
|
| + bool similarity) {
|
| return SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, params, gamma, gammaParams, lum,
|
| similarity));
|
| }
|
| #else
|
| - static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& params,
|
| - bool similarity) {
|
| + static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,
|
| + bool similarity) {
|
| return SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, params, similarity));
|
| }
|
| #endif
|
| @@ -79,10 +79,9 @@ private:
|
| */
|
| class GrDistanceFieldLCDTextureEffect : public GrVertexEffect {
|
| public:
|
| - static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& params,
|
| - GrTexture* gamma, const GrTextureParams& gammaParams,
|
| - SkColor textColor,
|
| - bool uniformScale, bool useBGR) {
|
| + static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,
|
| + GrTexture* gamma, const GrTextureParams& gammaParams,
|
| + SkColor textColor, bool uniformScale, bool useBGR) {
|
| return SkNEW_ARGS(GrDistanceFieldLCDTextureEffect,
|
| (tex, params, gamma, gammaParams, textColor, uniformScale, useBGR));
|
| }
|
|
|