Add maxCharWidth and a compile flag to use old metrics (needed by Blink).

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 821 matching lines @@
 
     if (mx) {
         sk_bzero(mx, sizeof(*mx));
     }
     if (my) {
         sk_bzero(my, sizeof(*my));
     }
 
     SkASSERT(fDDC);
 
+#ifndef SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS
     if (fType == SkScalerContext_Windows::kBitmap_Type) {
+#endif
         if (mx) {
             mx->fTop = SkIntToScalar(-fTM.tmAscent);
             mx->fAscent = SkIntToScalar(-fTM.tmAscent);
             mx->fDescent = -SkIntToScalar(fTM.tmDescent);
             mx->fBottom = SkIntToScalar(fTM.tmDescent);
             mx->fLeading = SkIntToScalar(fTM.tmExternalLeading);
         }
 
         if (my) {
             my->fTop = SkIntToScalar(-fTM.tmAscent);
             my->fAscent = SkIntToScalar(-fTM.tmAscent);
             my->fDescent = SkIntToScalar(-fTM.tmDescent);
             my->fBottom = SkIntToScalar(fTM.tmDescent);
             my->fLeading = SkIntToScalar(fTM.tmExternalLeading);
             my->fAvgCharWidth = SkIntToScalar(fTM.tmAveCharWidth);
+            my->fMaxCharWidth = SkIntToScalar(fTM.tmMaxCharWidth);
+            my->fXMin = 0;
+            my->fXMax = my->fMaxCharWidth;
+            //my->fXHeight = 0;
         }
+#ifndef SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS
         return;
     }
+#endif
 
     OUTLINETEXTMETRIC otm;
 
     uint32_t ret = GetOutlineTextMetrics(fDDC, sizeof(otm), &otm);
     if (GDI_ERROR == ret) {
         LogFontTypeface::EnsureAccessible(this->getTypeface());
         ret = GetOutlineTextMetrics(fDDC, sizeof(otm), &otm);
     }
     if (sizeof(otm) != ret) {
         return;
     }
 
     if (mx) {
         mx->fTop = -fScale * otm.otmrcFontBox.left;
         mx->fAscent = -fScale * otm.otmAscent;
         mx->fDescent = -fScale * otm.otmDescent;
         mx->fBottom = fScale * otm.otmrcFontBox.right;
         mx->fLeading = fScale * otm.otmLineGap;
     }
 
     if (my) {
+#ifndef SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS
         my->fTop = -fScale * otm.otmrcFontBox.top;
         my->fAscent = -fScale * otm.otmAscent;
         my->fDescent = -fScale * otm.otmDescent;
         my->fBottom = -fScale * otm.otmrcFontBox.bottom;
         my->fLeading = fScale * otm.otmLineGap;
         my->fAvgCharWidth = fScale * otm.otmTextMetrics.tmAveCharWidth;
+        my->fMaxCharWidth = fScale * otm.otmTextMetrics.tmMaxCharWidth;
+        my->fXMin = fScale * otm.otmrcFontBox.left;
+        my->fXMax = fScale * otm.otmrcFontBox.right;
+#endif
         my->fXHeight = fScale * otm.otmsXHeight;
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
 
 static void build_power_table(uint8_t table[], float ee) {
     for (int i = 0; i < 256; i++) {
         float x = i / 255.f;
         x = sk_float_pow(x, ee);
@@ skipping 1005 matching lines @@
         return this->createFromStream(stream);
     }
 
 private:
     SkTDArray<ENUMLOGFONTEX> fLogFontArray;
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkNEW(SkFontMgrGDI);
 }