diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 16:21:20 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 16:21:20 +0000 |
| commit | 86b4a2c65a51f2d759bf452f10b36d22cb0ca2f0 (patch) | |
| tree | 8ed3efcd8d063e9a0c3d10a68af56f33b21c3009 /skia | |
| parent | d950250b36d495c7f714aafcc4965eaee7bfe0d8 (diff) | |
| download | chromium_src-86b4a2c65a51f2d759bf452f10b36d22cb0ca2f0.zip chromium_src-86b4a2c65a51f2d759bf452f10b36d22cb0ca2f0.tar.gz chromium_src-86b4a2c65a51f2d759bf452f10b36d22cb0ca2f0.tar.bz2 | |
roll skia to 3709
Review URL: https://chromiumcodereview.appspot.com/10119012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index cfec687..aa141cf 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -363,6 +363,8 @@ '../third_party/skia/src/gpu/GrBufferAllocPool.cpp', '../third_party/skia/src/gpu/GrBufferAllocPool.h', '../third_party/skia/src/gpu/GrClip.cpp', + '../third_party/skia/src/gpu/GrClipMaskManager.cpp', + '../third_party/skia/src/gpu/GrClipMaskManager.h', '../third_party/skia/src/gpu/GrContext.cpp', '../third_party/skia/src/gpu/GrDefaultPathRenderer.cpp', '../third_party/skia/src/gpu/GrDefaultPathRenderer.h', @@ -845,7 +847,6 @@ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp', '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', - '../third_party/skia/src/ports/SkFontHost_tables.cpp', ], }], [ 'OS == "android"', { @@ -931,6 +932,11 @@ 'sources': [ '../third_party/skia/src/utils/mac/SkStream_mac.cpp', ], + 'sources!': [ + # The mac's fonthost implements the table methods natively, + # so no need for these generic versions. + '../third_party/skia/src/ports/SkFontHost_tables.cpp', + ], 'conditions': [ [ 'use_skia == 0', { 'sources/': [ |