From 9e3cadc39f990c2955e1c6bfeb8686fa6f25ad85 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Tue, 21 Jul 2009 18:42:50 +0000 Subject: Skia merge 250:278 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21196 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/skia.gyp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'skia') diff --git a/skia/skia.gyp b/skia/skia.gyp index ead7cfd..559c90c 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -188,8 +188,6 @@ '../third_party/skia/src/core/SkBitmapSampler.cpp', '../third_party/skia/src/core/SkBitmapSampler.h', '../third_party/skia/src/core/SkBitmapSamplerTemplate.h', - '../third_party/skia/src/core/SkBitmapShader.cpp', - '../third_party/skia/src/core/SkBitmapShader.h', '../third_party/skia/src/core/SkBitmapShader16BilerpTemplate.h', '../third_party/skia/src/core/SkBitmapShaderTemplate.h', '../third_party/skia/src/core/SkBitmap_scroll.cpp', @@ -593,11 +591,17 @@ 'ext/SkFontHost_fontconfig.cpp', 'ext/SkFontHost_fontconfig_direct.cpp', 'ext/SkFontHost_fontconfig_ipc.cpp', + '../third_party/skia/src/core/SkBlitter_ARGB32_Subpixel.cpp', + '../third_party/skia/src/ports/SkFontHost_FreeType_Subpixel.cpp', + '../third_party/skia/src/core/SkFontHost.cpp', ], 'export_dependent_settings': [ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz_interface', ], + 'defines': [ + 'SK_BUILD_SUBPIXEL', + ], }], [ 'OS == "mac"', { 'defines': [ -- cgit v1.1