diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-21 18:42:50 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-21 18:42:50 +0000 |
| commit | 9e3cadc39f990c2955e1c6bfeb8686fa6f25ad85 (patch) | |
| tree | c5ec178f30b5f7a6622e19d6b7ddcb645454b618 /skia | |
| parent | 782847e01ecd3167fcbc40f77dc5522672b2072e (diff) | |
| download | chromium_src-9e3cadc39f990c2955e1c6bfeb8686fa6f25ad85.zip chromium_src-9e3cadc39f990c2955e1c6bfeb8686fa6f25ad85.tar.gz chromium_src-9e3cadc39f990c2955e1c6bfeb8686fa6f25ad85.tar.bz2 | |
Skia merge 250:278
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
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': [ |