Change type of SkGlyph::fAdvance[XY] to float.

src/fonts/SkGScalerContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGScalerContext.h"
 #include "SkGlyph.h"
 #include "SkPath.h"
@@ skipping 59 matching lines @@
 }
 
 uint16_t SkGScalerContext::generateCharToGlyph(SkUnichar uni) {
     return fProxy->charToGlyphID(uni);
 }
 
 void SkGScalerContext::generateAdvance(SkGlyph* glyph) {
     fProxy->getAdvance(glyph);
 
     SkVector advance;
-    fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
-                  SkFixedToScalar(glyph->fAdvanceY), &advance);
-    glyph->fAdvanceX = SkScalarToFixed(advance.fX);
-    glyph->fAdvanceY = SkScalarToFixed(advance.fY);
+    fMatrix.mapXY(SkFloatToScalar(glyph->fAdvanceX),
+                  SkFloatToScalar(glyph->fAdvanceY), &advance);
+    glyph->fAdvanceX = SkScalarToFloat(advance.fX);
+    glyph->fAdvanceY = SkScalarToFloat(advance.fY);
 }
 
 void SkGScalerContext::generateMetrics(SkGlyph* glyph) {
     fProxy->getMetrics(glyph);
 
     SkVector advance;
-    fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
-                  SkFixedToScalar(glyph->fAdvanceY), &advance);
-    glyph->fAdvanceX = SkScalarToFixed(advance.fX);
-    glyph->fAdvanceY = SkScalarToFixed(advance.fY);
+    fMatrix.mapXY(SkFloatToScalar(glyph->fAdvanceX),
+                  SkFloatToScalar(glyph->fAdvanceY), &advance);
+    glyph->fAdvanceX = SkScalarToFloat(advance.fX);
+    glyph->fAdvanceY = SkScalarToFloat(advance.fY);
 
     SkPath path;
     fProxy->getPath(*glyph, &path);
     path.transform(fMatrix);
 
     SkRect storage;
     const SkPaint& paint = fFace->paint();
     const SkRect& newBounds = paint.doComputeFastBounds(path.getBounds(),
                                                         &storage,
                                                         SkPaint::kFill_Style);
@@ skipping 151 matching lines @@
 
     friend class SkGFontBuilder;
     SkGFont(int count, Glyph* array);
 };
 
 class SkGFontBuilder {
 public:
 
 };
 #endif