| Index: src/ports/SkFontHost_win_dw.cpp
|
| diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
|
| index b9f69bdb3ca26857be1acb5dec13a829d648d05e..f68a3d0638f72c7fe9e856ea3b37fae9e80e8919 100644
|
| --- a/src/ports/SkFontHost_win_dw.cpp
|
| +++ b/src/ports/SkFontHost_win_dw.cpp
|
| @@ -874,6 +874,11 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* mx,
|
| mx->fBottom = mx->fDescent;
|
| mx->fLeading = fRec.fTextSize * SkIntToScalar(dwfm.lineGap) / upem;
|
| mx->fXHeight = fRec.fTextSize * SkIntToScalar(dwfm.xHeight) / upem;
|
| + mx->fUnderlineThickness = fRec.fTextSize * SkIntToScalar(dwfm.underlinePosition) / upem;
|
| + mx->fUnderlinePosition = fRec.fTextSize * SkIntToScalar(dwfm.underlineThickness) / upem;
|
| +
|
| + mx->validate(SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag);
|
| + mx->validate(SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag);
|
| }
|
|
|
| if (my) {
|
| @@ -883,6 +888,11 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* mx,
|
| my->fBottom = my->fDescent;
|
| my->fLeading = fRec.fTextSize * SkIntToScalar(dwfm.lineGap) / upem;
|
| my->fXHeight = fRec.fTextSize * SkIntToScalar(dwfm.xHeight) / upem;
|
| + my->fUnderlineThickness = fRec.fTextSize * SkIntToScalar(dwfm.underlinePosition) / upem;
|
| + my->fUnderlinePosition = fRec.fTextSize * SkIntToScalar(dwfm.underlineThickness) / upem;
|
| +
|
| + my->validate(SkPaint::FontMetrics::kUnderlineThinknessIsValid_Flag);
|
| + my->validate(SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag);
|
| }
|
| }
|
|
|
|
|