Cleanup conversion that the new NDK compiler tries to over optimize.

src/gpu/GrDistanceFieldTextContext.cpp

Index: src/gpu/GrDistanceFieldTextContext.cpp
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index 155f6365997bb22228dff710dc45ae22dabee28a..5e23ba0683e1bbb7b99caa99f42add7eb0f38f4c 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -316,9 +316,7 @@ void GrDistanceFieldTextContext::onDrawPosText(const GrPaint& paint, const SkPai
                 if (!this->appendGlyph(GrGlyph::Pack(glyph.getGlyphID(),
                                                      glyph.getSubXFixed(),
                                                      glyph.getSubYFixed()),
-                                       SkScalarToFixed(x),
-                                       SkScalarToFixed(y),
-                                       fontScaler)) {
+                                       x, y, fontScaler)) {
                     // couldn't append, send to fallback
                     fallbackTxt.push_back_n(text-lastText, lastText);
                     fallbackPos.push_back(pos[0]);
@@ -347,9 +345,7 @@ void GrDistanceFieldTextContext::onDrawPosText(const GrPaint& paint, const SkPai
                 if (!this->appendGlyph(GrGlyph::Pack(glyph.getGlyphID(),
                                                      glyph.getSubXFixed(),
                                                      glyph.getSubYFixed()),
-                                       SkScalarToFixed(x - advanceX),
-                                       SkScalarToFixed(y - advanceY),
-                                       fontScaler)) {
+                                       x - advanceX, y - advanceY, fontScaler)) {
                     // couldn't append, send to fallback
                     fallbackTxt.push_back_n(text-lastText, lastText);
                     fallbackPos.push_back(pos[0]);
@@ -452,7 +448,7 @@ void GrDistanceFieldTextContext::setupCoverageEffect(const SkColor& filteredColo
 // Returns true if this method handled the glyph, false if needs to be passed to fallback
 //
 bool GrDistanceFieldTextContext::appendGlyph(GrGlyph::PackedID packed,
-                                             SkFixed vx, SkFixed vy,
+                                             SkScalar sx, SkScalar sy,
                                              GrFontScaler* scaler) {
     if (NULL == fDrawTarget) {
         return true;
@@ -472,8 +468,6 @@ bool GrDistanceFieldTextContext::appendGlyph(GrGlyph::PackedID packed,
         return false;
     }
 
-    SkScalar sx = SkFixedToScalar(vx);
-    SkScalar sy = SkFixedToScalar(vy);
 /*
     // not valid, need to find a different solution for this
     vx += SkIntToFixed(glyph->fBounds.fLeft);