Index: src/ports/SkFontHost_FreeType.cpp |
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp |
index c7c77ff0167013ecfb11fff12211f77f22598327..f166e0b1916060b74f464f64898a6fe1bcf2d721 100644 |
--- a/src/ports/SkFontHost_FreeType.cpp |
+++ b/src/ports/SkFontHost_FreeType.cpp |
@@ -1495,14 +1495,8 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics |
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; |