diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:11:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 17:11:30 +0000 |
| commit | 1da87401514f92a95248d695f729553cbe486b0a (patch) | |
| tree | 1fe756c65aa0d5da47f639b405f3641983532cfa /skia | |
| parent | eb2e2f4495e44ed811633b436918cca114d2d073 (diff) | |
| download | chromium_src-1da87401514f92a95248d695f729553cbe486b0a.zip chromium_src-1da87401514f92a95248d695f729553cbe486b0a.tar.gz chromium_src-1da87401514f92a95248d695f729553cbe486b0a.tar.bz2 | |
Revert 132800 - Revert 132798 - roll skia to 3709
Review URL: https://chromiumcodereview.appspot.com/10119012
TBR=reed@google.com
Review URL: https://chromiumcodereview.appspot.com/10041030
TBR=reed@google.com
Review URL: https://chromiumcodereview.appspot.com/10117027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132805 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/': [ |