Stage fixes for underline position.

src/ports/SkFontHost_win.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 "SkBase64.h"
@@ skipping 1037 matching lines @@
 #ifndef SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS
         my->fTop = SkIntToScalar(-otm.otmrcFontBox.top);
         my->fAscent = SkIntToScalar(-otm.otmAscent);
         my->fDescent = SkIntToScalar(-otm.otmDescent);
         my->fBottom = SkIntToScalar(-otm.otmrcFontBox.bottom);
         my->fLeading = SkIntToScalar(otm.otmLineGap);
         my->fAvgCharWidth = SkIntToScalar(otm.otmTextMetrics.tmAveCharWidth);
         my->fMaxCharWidth = SkIntToScalar(otm.otmTextMetrics.tmMaxCharWidth);
         my->fXMin = SkIntToScalar(otm.otmrcFontBox.left);
         my->fXMax = SkIntToScalar(otm.otmrcFontBox.right);
+#endif
+#ifndef SK_IGNORE_UNDERLINE_POSITION_FIX
         my->fUnderlineThickness = SkIntToScalar(otm.otmsUnderscoreSize);
         my->fUnderlinePosition = -SkIntToScalar(otm.otmsUnderscorePosition);
 
         my->fFlags |= SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag;
         my->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag;
 #endif
         my->fXHeight = SkIntToScalar(otm.otmsXHeight);
 
         GLYPHMETRICS gm;
         sk_bzero(&gm, sizeof(gm));
@@ skipping 1547 matching lines @@
 
 private:
     SkTDArray<ENUMLOGFONTEX> fLogFontArray;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr_New_GDI() {
     return SkNEW(SkFontMgrGDI);
 }