Stage fixes for underline position.

src/ports/SkFontHost_FreeType.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
@@ skipping 1389 matching lines @@
     SkScalar underlineThickness, underlinePosition;
     if (face->face_flags & FT_FACE_FLAG_SCALABLE) { // scalable outline font
         ascent = -SkIntToScalar(face->ascender) / upem;
         descent = -SkIntToScalar(face->descender) / upem;
         leading = SkIntToScalar(face->height + (face->descender - face->ascender)) / upem;
         xmin = SkIntToScalar(face->bbox.xMin) / upem;
         xmax = SkIntToScalar(face->bbox.xMax) / upem;
         ymin = -SkIntToScalar(face->bbox.yMin) / upem;
         ymax = -SkIntToScalar(face->bbox.yMax) / upem;
         underlineThickness = SkIntToScalar(face->underline_thickness) / upem;
+#ifdef SK_IGNORE_UNDERLINE_POSITION_FIX
         underlinePosition = -SkIntToScalar(face->underline_position) / upem;
+#else
+        underlinePosition = -SkIntToScalar(face->underline_position +
+                                           face->underline_thickness / 2) / upem;
+#endif
 
         if(mx) {
             mx->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag;
             mx->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag;
         }
         if(my){
             my->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag;
             my->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag;
         }
         // we may be able to synthesize x_height and cap_height from outline
@@ skipping 55 matching lines @@
         mx->fTop = ymax * mxy;
         mx->fAscent = ascent * mxy;
         mx->fDescent = descent * mxy;
         mx->fBottom = ymin * mxy;
         mx->fLeading = leading * mxy;
         mx->fAvgCharWidth = avgCharWidth * mxy;
         mx->fXMin = xmin;
         mx->fXMax = xmax;
         mx->fXHeight = x_height;
         mx->fCapHeight = cap_height;
+#ifdef SK_IGNORE_UNDERLINE_POSITION_FIX
         mx->fUnderlineThickness = underlineThickness;
         mx->fUnderlinePosition = underlinePosition;
+#else
+        mx->fUnderlineThickness = underlineThickness * mxy;
+        mx->fUnderlinePosition = underlinePosition * mxy;
+#endif
     }
     if (my) {
         my->fTop = ymax * myy;
         my->fAscent = ascent * myy;
         my->fDescent = descent * myy;
         my->fBottom = ymin * myy;
         my->fLeading = leading * myy;
         my->fAvgCharWidth = avgCharWidth * myy;
         my->fXMin = xmin;
         my->fXMax = xmax;
         my->fXHeight = x_height;
         my->fCapHeight = cap_height;
+#ifdef SK_IGNORE_UNDERLINE_POSITION_FIX
         my->fUnderlineThickness = underlineThickness;
         my->fUnderlinePosition = underlinePosition;
+#else
+        my->fUnderlineThickness = underlineThickness * myy;
+        my->fUnderlinePosition = underlinePosition * myy;
+#endif
     }
 }
 
 void SkScalerContext_FreeType::emboldenIfNeeded(FT_Face face, FT_GlyphSlot glyph)
 {
     // check to see if the embolden bit is set
     if (0 == (fRec.fFlags & SkScalerContext::kEmbolden_Flag)) {
         return;
     }
 
@@ skipping 215 matching lines @@
         *style = (SkTypeface::Style) tempStyle;
     }
     if (isFixedPitch) {
         *isFixedPitch = FT_IS_FIXED_WIDTH(face);
     }
 
     FT_Done_Face(face);
     FT_Done_FreeType(library);
     return true;
 }