Distance field fixes for Android

src/gpu/effects/GrDistanceFieldTextureEffect.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDistanceFieldTextureEffect_DEFINED
 #define GrDistanceFieldTextureEffect_DEFINED
 
 #include "GrEffect.h"
 #include "GrVertexEffect.h"
 
 class GrGLDistanceFieldTextureEffect;
 
 /**
  * The output color of this effect is a modulation of the input color and a sample from a
  * distance field texture (using a smoothed step function near 0.5).
  * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
  * coords are a custom attribute.
  */
 class GrDistanceFieldTextureEffect : public GrVertexEffect {
 public:
-    static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& p, const SkISize& s) {
-        AutoEffectUnref effect(SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, p, s)));
+    static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& p, const SkISize& s,

[bsalomon, 2014/03/26 13:18:58]

It seems a little weird that the public function has short param names and the
private cons has more explicit names.

What is the texture size for? Is it different than texture->width(),
texture->height()?

[jvanverth1, 2014/03/26 16:24:00]

I've removed it -- it's not necessary. I also added code to key off of uniform
scale/nonUniform scale.

+                               bool u) {
+        AutoEffectUnref effect(SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, p, s, u)));
         return CreateEffectRef(effect);
     }
 
     virtual ~GrDistanceFieldTextureEffect() {}
 
     static const char* Name() { return "DistanceFieldTexture"; }
 
     virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
     const SkSize& getSize() const { return fSize; }
+    bool isUniformScale() const { return fUniformScale; }
 
     typedef GrGLDistanceFieldTextureEffect GLEffect;
 
     virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
 
 private:
     GrDistanceFieldTextureEffect(GrTexture* texture, const GrTextureParams& params,
-                                 const SkISize& textureSize);
+                                 const SkISize& textureSize, bool uniformScale);
 
     virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
 
     GrTextureAccess fTextureAccess;
     SkSize          fSize;
+    bool            fUniformScale;
 
     GR_DECLARE_EFFECT_TEST;
 
     typedef GrVertexEffect INHERITED;
 };
 
 #endif