SK_USE_SCALED_FONTMETRICS for correct scaling

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 1477 matching lines @@
     SkScalar scale = myy;
     if (this->isVertical()) {
         scale = mxy;
     }
     metrics->fTop = ymax * scale;
     metrics->fAscent = ascent * scale;
     metrics->fDescent = descent * scale;
     metrics->fBottom = ymin * scale;
     metrics->fLeading = leading * scale;
     metrics->fAvgCharWidth = avgCharWidth * scale;
+#ifdef SK_USE_SCALED_FONTMETRICS
+    // new correct behavior. need chrome to define this, and then we can remove the else code
+    metrics->fXMin = xmin * scale;
+    metrics->fXMax = xmax * scale;
+#else
     metrics->fXMin = xmin;
     metrics->fXMax = xmax;
+#endif
     metrics->fXHeight = x_height;
     metrics->fCapHeight = cap_height;
     metrics->fUnderlineThickness = underlineThickness * scale;
     metrics->fUnderlinePosition = underlinePosition * scale;
 }
 
 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)) {
@@ skipping 291 matching lines @@
     if (style) {
         *style = SkFontStyle(weight, width, slant);
     }
     if (isFixedPitch) {
         *isFixedPitch = FT_IS_FIXED_WIDTH(face);
     }
 
     FT_Done_Face(face);
     return true;
 }