Revert of Distance field fixes for Android

src/gpu/effects/GrDistanceFieldTextureEffect.h

Index: src/gpu/effects/GrDistanceFieldTextureEffect.h
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h
index 212532e0a8664d765e46ac3393cb64b51d3ccaee..1292c0322126608943068f6c02955922028167ec 100644
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.h
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h
@@ -21,8 +21,8 @@
  */
 class GrDistanceFieldTextureEffect : public GrVertexEffect {
 public:
-    static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& para, bool uniformScale) {
-        AutoEffectUnref effect(SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, para, uniformScale)));
+    static GrEffectRef* Create(GrTexture* tex, const GrTextureParams& p, const SkISize& s) {
+        AutoEffectUnref effect(SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, p, s)));
         return CreateEffectRef(effect);
     }
 
@@ -31,7 +31,7 @@
     static const char* Name() { return "DistanceFieldTexture"; }
 
     virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-    bool isUniformScale() const { return fUniformScale; }
+    const SkSize& getSize() const { return fSize; }
 
     typedef GrGLDistanceFieldTextureEffect GLEffect;
 
@@ -39,12 +39,12 @@
 
 private:
     GrDistanceFieldTextureEffect(GrTexture* texture, const GrTextureParams& params,
-                                 bool uniformScale);
+                                 const SkISize& textureSize);
 
     virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
 
     GrTextureAccess fTextureAccess;
-    bool            fUniformScale;
+    SkSize          fSize;
 
     GR_DECLARE_EFFECT_TEST;