Fix for 10963: Use mx instead of my where mx is wanted.
authorbungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 28 Aug 2013 03:16:02 +0000 (03:16 +0000)
committerbungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 28 Aug 2013 03:16:02 +0000 (03:16 +0000)
git-svn-id: http://skia.googlecode.com/svn/trunk@10966 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_win_dw.cpp

index 52b2fee..41a06f1 100644 (file)
@@ -920,12 +920,12 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* mx,
 
     SkScalar upem = SkIntToScalar(dwfm.designUnitsPerEm);
     if (mx) {
-        my->fTop = -fRec.fTextSize * SkIntToScalar(dwfm.ascent) / upem;
-        my->fAscent = my->fTop;
-        my->fDescent = fRec.fTextSize * SkIntToScalar(dwfm.descent) / upem;
-        my->fBottom = my->fDescent;
-        my->fLeading = fRec.fTextSize * SkIntToScalar(dwfm.lineGap) / upem;
-        my->fXHeight = fRec.fTextSize * SkIntToScalar(dwfm.xHeight) / upem;
+        mx->fTop = -fRec.fTextSize * SkIntToScalar(dwfm.ascent) / upem;
+        mx->fAscent = mx->fTop;
+        mx->fDescent = fRec.fTextSize * SkIntToScalar(dwfm.descent) / upem;
+        mx->fBottom = mx->fDescent;
+        mx->fLeading = fRec.fTextSize * SkIntToScalar(dwfm.lineGap) / upem;
+        mx->fXHeight = fRec.fTextSize * SkIntToScalar(dwfm.xHeight) / upem;
     }
 
     if (my) {