diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/ports/SkFontHost_FreeType.cpp | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 3 |
3 files changed, 5 insertions, 2 deletions
@@ -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', |