diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 01:30:25 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 01:30:25 +0000 |
| commit | 19142c82dce312511883768af6c4d4695f3f408b (patch) | |
| tree | e6d59ccc29508585d554ed59ef112bd4d471179d /skia | |
| parent | 9f5b80a726212c9c0a2d0027d1ba71592026c988 (diff) | |
| download | chromium_src-19142c82dce312511883768af6c4d4695f3f408b.zip chromium_src-19142c82dce312511883768af6c4d4695f3f408b.tar.gz chromium_src-19142c82dce312511883768af6c4d4695f3f408b.tar.bz2 | |
Linux: layout test fix
I need another round trip land a patch in WebKit to fix it correctly, but
noones's around now and I probably won't get a chance before the merge tomorrow
morning
TBR=evanm
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ports/SkFontHost_FreeType.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/skia/ports/SkFontHost_FreeType.cpp b/skia/ports/SkFontHost_FreeType.cpp index f1f1569..461145f 100644 --- a/skia/ports/SkFontHost_FreeType.cpp +++ b/skia/ports/SkFontHost_FreeType.cpp @@ -881,7 +881,11 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx, ys[0] = -face->bbox.yMax; ys[1] = -face->ascender; - ys[2] = -face->descender; + // Bodge this for now. I need another round trip land a patch in + // WebKit to fix it correctly, but noones's around now and I + // probably won't get a chance before the merge tomorrow morning + // -- agl + ys[2] = -face->descender + 2*face->ascender; ys[3] = -face->bbox.yMin; ys[4] = leading; ys[5] = os2 ? os2->xAvgCharWidth : 0; |