AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use more fields from OutlineFontMEtrics: linegap, bbox.

Browse Source 
Up our canonical size to 2048 to reduce precision loss.

R=bungeman@google.com

Review URL: https://codereview.chromium.org/14759021

git-svn-id: http://skia.googlecode.com/svn/trunk@9057 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-05-08 14:11:28 +00:00
parent fed9db6930
commit 60af92cb6d
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ports/SkFontHost_win.cpp
View File

@ -99,8 +99,11 @@ static uint8_t glyphbuf[BUFFERSIZE];
* and since we have a cache of LOGFONTs for our tyepfaces, we always set the * and since we have a cache of LOGFONTs for our tyepfaces, we always set the
* lfHeight to a canonical size, and then we use the 2x2 matrix to achieve the * lfHeight to a canonical size, and then we use the 2x2 matrix to achieve the
* actual requested size. * actual requested size.
*
* Not critical to match the font's upem, but we want it big enough to avoid
* precision loss for GDI calls that return ints (e.g. GetOutlineFontMetrics).
*/ */
static const int gCanonicalTextSize = 64; static const int gCanonicalTextSize = 2048;
static void tchar_to_skstring(const TCHAR t[], SkString* s) { static void tchar_to_skstring(const TCHAR t[], SkString* s) {
#ifdef UNICODE #ifdef UNICODE
@ -835,10 +838,16 @@ void SkScalerContext_Windows::generateMetrics(SkGlyph* glyph) {
} }
void SkScalerContext_Windows::generateFontMetrics(SkPaint::FontMetrics* mx, SkPaint::FontMetrics* my) { void SkScalerContext_Windows::generateFontMetrics(SkPaint::FontMetrics* mx, SkPaint::FontMetrics* my) {
// Note: This code was borrowed from generateLineHeight, which has a note if (!(mx || my)) {
// stating that it may be incorrect.
if (!(mx || my))
return; return;
}
if (mx) {
sk_bzero(mx, sizeof(*mx));
}
if (my) {
sk_bzero(my, sizeof(*my));
}
SkASSERT(fDDC); SkASSERT(fDDC);
@ -848,8 +857,7 @@ void SkScalerContext_Windows::generateFontMetrics(SkPaint::FontMetrics* mx, SkPa
mx->fAscent = SkIntToScalar(-fTM.tmAscent); mx->fAscent = SkIntToScalar(-fTM.tmAscent);
mx->fDescent = -SkIntToScalar(fTM.tmDescent); mx->fDescent = -SkIntToScalar(fTM.tmDescent);
mx->fBottom = SkIntToScalar(fTM.tmDescent); mx->fBottom = SkIntToScalar(fTM.tmDescent);
mx->fLeading = SkIntToScalar(fTM.tmInternalLeading mx->fLeading = SkIntToScalar(fTM.tmExternalLeading);
+ fTM.tmExternalLeading);
} }
if (my) { if (my) {
@ -857,8 +865,8 @@ void SkScalerContext_Windows::generateFontMetrics(SkPaint::FontMetrics* mx, SkPa
my->fAscent = SkIntToScalar(-fTM.tmAscent); my->fAscent = SkIntToScalar(-fTM.tmAscent);
my->fDescent = SkIntToScalar(-fTM.tmDescent); my->fDescent = SkIntToScalar(-fTM.tmDescent);
my->fBottom = SkIntToScalar(fTM.tmDescent); my->fBottom = SkIntToScalar(fTM.tmDescent);
my->fLeading = SkIntToScalar(fTM.tmInternalLeading my->fLeading = SkIntToScalar(fTM.tmExternalLeading);
+ fTM.tmExternalLeading); my->fAvgCharWidth = SkIntToScalar(fTM.tmAveCharWidth);
} }
return; return;
} }
@ -875,21 +883,21 @@ void SkScalerContext_Windows::generateFontMetrics(SkPaint::FontMetrics* mx, SkPa
} }
if (mx) { if (mx) {
mx->fTop = -fScale * otm.otmTextMetrics.tmAscent; mx->fTop = -fScale * otm.otmrcFontBox.left;
mx->fAscent = -fScale * otm.otmAscent; mx->fAscent = -fScale * otm.otmAscent;
mx->fDescent = -fScale * otm.otmDescent; mx->fDescent = -fScale * otm.otmDescent;
mx->fBottom = fScale * otm.otmTextMetrics.tmDescent; mx->fBottom = fScale * otm.otmrcFontBox.right;
mx->fLeading = fScale * (otm.otmTextMetrics.tmInternalLeading mx->fLeading = fScale * otm.otmLineGap;
+ otm.otmTextMetrics.tmExternalLeading);
} }
if (my) { if (my) {
my->fTop = -fScale * otm.otmTextMetrics.tmAscent; my->fTop = -fScale * otm.otmrcFontBox.top;
my->fAscent = -fScale * otm.otmAscent; my->fAscent = -fScale * otm.otmAscent;
my->fDescent = -fScale * otm.otmDescent; my->fDescent = -fScale * otm.otmDescent;
my->fBottom = fScale * otm.otmTextMetrics.tmDescent; my->fBottom = fScale * otm.otmrcFontBox.bottom;
my->fLeading = fScale * (otm.otmTextMetrics.tmInternalLeading my->fLeading = fScale * otm.otmLineGap;
+ otm.otmTextMetrics.tmExternalLeading); my->fAvgCharWidth = fScale * otm.otmTextMetrics.tmAveCharWidth;
my->fXHeight = fScale * otm.otmsXHeight;
} }
} }