From 722065e427af4bdb08c27775937a97f31676fb4d Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Wed, 15 Apr 2009 20:36:14 +0000 Subject: 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 --- DEPS | 2 +- skia/ports/SkFontHost_FreeType.cpp | 2 +- webkit/webkit.gyp | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index efed170..c3d53b5 100644 --- a/DEPS +++ b/DEPS @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@13777", + "/trunk/deps/third_party/WebKit@13780", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", 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; diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 5f9179f..24b23f6 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3970,6 +3970,9 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', ], + 'sources': [ + '../third_party/WebKit/WebCore/platform/graphics/chromium/VDMXParser.cpp', + ], 'sources!': [ # Not yet ported to Linux. '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp', -- cgit v1.1