summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 14:15:19 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 14:15:19 +0000
commit7780e5cfc485f1a79218e38840acc1eebd2817a8 (patch)
treee9c52e4cda9ae821ee1bebcbf5c96a0f8df5f3ff /skia
parent0c7b1a0e93a2364006de7456e9a106b5ec01478c (diff)
downloadchromium_src-7780e5cfc485f1a79218e38840acc1eebd2817a8.zip
chromium_src-7780e5cfc485f1a79218e38840acc1eebd2817a8.tar.gz
chromium_src-7780e5cfc485f1a79218e38840acc1eebd2817a8.tar.bz2
roll skia to 2160, mirror of http://codereview.chromium.org/7719002/
Review URL: http://codereview.chromium.org/7719027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp8
1 files changed, 6 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index af1e5ad..076df75 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -8,13 +8,15 @@
'target_name': 'skia',
'type': '<(component)',
'sources': [
+ '../third_party/skia/gpu/src/GrAddPathRenderers_none.cpp',
'../third_party/skia/gpu/src/GrAllocPool.cpp',
'../third_party/skia/gpu/src/GrAtlas.cpp',
'../third_party/skia/gpu/src/GrBufferAllocPool.cpp',
'../third_party/skia/gpu/src/GrBufferAllocPool.h',
'../third_party/skia/gpu/src/GrClip.cpp',
'../third_party/skia/gpu/src/GrContext.cpp',
- '../third_party/skia/gpu/src/GrCreatePathRenderer_none.cpp',
+ '../third_party/skia/gpu/src/GrDefaultPathRenderer.cpp',
+ '../third_party/skia/gpu/src/GrDefaultPathRenderer.h',
'../third_party/skia/gpu/src/GrDrawTarget.cpp',
'../third_party/skia/gpu/src/GrDrawTarget.h',
'../third_party/skia/gpu/src/GrGeometryBuffer.h',
@@ -50,6 +52,8 @@
'../third_party/skia/gpu/src/GrMemory.cpp',
'../third_party/skia/gpu/src/GrPathRenderer.cpp',
'../third_party/skia/gpu/src/GrPathRenderer.h',
+ '../third_party/skia/gpu/src/GrPathRendererChain.cpp',
+ '../third_party/skia/gpu/src/GrPathRendererChain.h',
'../third_party/skia/gpu/src/GrPathUtils.cpp',
'../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
'../third_party/skia/gpu/src/GrRenderTarget.cpp',
@@ -850,7 +854,7 @@
'skia_opts',
'skia_libtess',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../third_party/sfntly/sfntly.gyp:sfntly',
+ '../third_party/sfntly/sfntly.gyp:sfntly',
'../third_party/zlib/zlib.gyp:zlib',
],
'direct_dependent_settings': {