summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 20:36:14 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 20:36:14 +0000
commit722065e427af4bdb08c27775937a97f31676fb4d (patch)
tree6fa580c7fca386547549d5984a0305a91459551e /skia
parent332b4ec9bae23c2e1775c56d4378caeb8b7ec3c7 (diff)
downloadchromium_src-722065e427af4bdb08c27775937a97f31676fb4d.zip
chromium_src-722065e427af4bdb08c27775937a97f31676fb4d.tar.gz
chromium_src-722065e427af4bdb08c27775937a97f31676fb4d.tar.bz2
Linux: Move VDMX parsing into WebKit.
This is the Chromium side of: https://bugs.webkit.org/show_bug.cgi?id=25116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ports/SkFontHost_FreeType.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ports/SkFontHost_FreeType.cpp b/skia/ports/SkFontHost_FreeType.cpp
index 2a5483d..b18796a 100644
--- a/skia/ports/SkFontHost_FreeType.cpp
+++ b/skia/ports/SkFontHost_FreeType.cpp
@@ -887,7 +887,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx,
// 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[2] = -face->descender;
ys[3] = -face->bbox.yMin;
ys[4] = leading;
ys[5] = os2 ? os2->xAvgCharWidth : 0;