Index: src/ports/SkFontHost_mac.cpp |
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp |
index 04af69660822236b5760f21ec2518282ff255e1d..8e18607193af263f99da62e62e49d6c5b94a3498 100755 |
--- a/src/ports/SkFontHost_mac.cpp |
+++ b/src/ports/SkFontHost_mac.cpp |
@@ -1379,6 +1379,11 @@ void SkScalerContext_Mac::generateFontMetrics(SkPaint::FontMetrics* mx, |
theMetrics.fXMin = CGToScalar( CGRectGetMinX_inline(theBounds)); |
theMetrics.fXMax = CGToScalar( CGRectGetMaxX_inline(theBounds)); |
theMetrics.fXHeight = CGToScalar( CTFontGetXHeight(fCTFont)); |
+ theMetrics.fUnderlineThickness = CGToScalar( CTFontGetUnderlineThickness(fCTFont)); |
+ theMetrics.fUnderlinePosition = CGToScalar( CTFontGetUnderlinePosition(fCTFont)); |
+ |
+ theMetrics.setFontMetricsFlag(SkPaint::FontMetrics::kUnderlineThinknessIsValid_FontMetricFlag); |
+ theMetrics.setFontMetricsFlag(SkPaint::FontMetrics::kUnderlinePositionIsValid_FontMetricsflag); |
if (mx != NULL) { |
*mx = theMetrics; |