Skia: remove fHeight

skia/ports/SkFontHost_FreeType.cpp

Index: skia/ports/SkFontHost_FreeType.cpp
diff --git a/skia/ports/SkFontHost_FreeType.cpp b/skia/ports/SkFontHost_FreeType.cpp
index 8ffb3ca1a27fc4ff772a9a335bb7734d3d4147b8..248465a250c2bb5a5e423e5882f1dce0fb69e94a 100644
--- a/skia/ports/SkFontHost_FreeType.cpp
+++ b/skia/ports/SkFontHost_FreeType.cpp
@@ -870,7 +870,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx,
     SkScalar xmin = static_cast<SkScalar>(face->bbox.xMin) / upem;
     SkScalar xmax = static_cast<SkScalar>(face->bbox.xMax) / upem;
 
-    int leading = face->height - face->ascender + face->descender;
+    int leading = face->height - (face->ascender + face->descender);
     if (leading < 0) {
         leading = 0;
     }
@@ -884,8 +884,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx,
     ys[2] = -face->descender;
     ys[3] = -face->bbox.yMin;
     ys[4] = leading;
-    ys[5] = face->height;
-    ys[6] = os2 ? os2->xAvgCharWidth : 0;
+    ys[5] = os2 ? os2->xAvgCharWidth : 0;
 
     SkScalar x_height;
     if (os2 && os2->sxHeight) {
@@ -904,7 +903,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx,
     }
 
     // convert upem-y values into scalar points
-    for (int i = 0; i < 7; i++) {
+    for (int i = 0; i < 6; i++) {
         SkFixed y = SkMulDiv(scaleY, ys[i], upem);
         SkFixed x = SkFixedMul(mxy, y);
         y = SkFixedMul(myy, y);
@@ -917,8 +916,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx,
         mx->fDescent = pts[2].fX;
         mx->fBottom = pts[3].fX;
         mx->fLeading = pts[4].fX;
-        mx->fHeight = pts[5].fX;
-        mx->fAvgCharWidth = pts[6].fX;
+        mx->fAvgCharWidth = pts[5].fX;
         mx->fXMin = xmin;
         mx->fXMax = xmax;
         mx->fXHeight = x_height;
@@ -933,8 +931,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx,
         my->fDescent = pts[2].fY;
         my->fBottom = pts[3].fY;
         my->fLeading = pts[4].fY;
-        my->fHeight = pts[5].fY;
-        my->fAvgCharWidth = pts[6].fY;
+        my->fAvgCharWidth = pts[5].fY;
         my->fXMin = xmin;
         my->fXMax = xmax;
         my->fXHeight = x_height;