summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 14:29:48 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 14:29:48 +0000
commit8b5bb5b0f69b2ed26ee3d64395b0fd75f22cab21 (patch)
tree50182da7ede1532f7ee144e49c05f981eb3c6721 /skia
parentb096ce14f3a2bd6c9d1003b3cb0a68929515cda7 (diff)
downloadchromium_src-8b5bb5b0f69b2ed26ee3d64395b0fd75f22cab21.zip
chromium_src-8b5bb5b0f69b2ed26ee3d64395b0fd75f22cab21.tar.gz
chromium_src-8b5bb5b0f69b2ed26ee3d64395b0fd75f22cab21.tar.bz2
roll skia
Review URL: http://codereview.chromium.org/6638001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77280 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 dee63a6..bbd33c9 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -21,17 +21,18 @@
'../third_party/skia/gpu/src/GrGLUtil.cpp',
'../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
'../third_party/skia/gpu/src/GrGpu.cpp',
- '../third_party/skia/gpu/src/GrGpuGLShaders2.h',
'../third_party/skia/gpu/src/GrGpuFactory.cpp',
'../third_party/skia/gpu/src/GrGpuGL.cpp',
'../third_party/skia/gpu/src/GrGpuGL.h',
+ '../third_party/skia/gpu/src/GrGpuGLShaders2.cpp',
+ '../third_party/skia/gpu/src/GrGpuGLShaders2.h',
'../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
'../third_party/skia/gpu/src/GrMatrix.cpp',
'../third_party/skia/gpu/src/GrMemory.cpp',
'../third_party/skia/gpu/src/GrPath.cpp',
'../third_party/skia/gpu/src/GrPathRenderer.cpp',
'../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
- '../third_party/skia/gpu/src/GrGpuGLShaders2.cpp',
+ '../third_party/skia/gpu/src/GrStencil.cpp',
'../third_party/skia/gpu/src/GrTextureCache.cpp',
'../third_party/skia/gpu/src/GrTextContext.cpp',
'../third_party/skia/gpu/src/GrTextStrike.cpp',
@@ -78,6 +79,7 @@
'../third_party/skia/gpu/include/GrRefCnt.h',
'../third_party/skia/gpu/include/GrSamplerState.h',
'../third_party/skia/gpu/include/GrScalar.h',
+ '../third_party/skia/gpu/include/GrStencil.h',
'../third_party/skia/gpu/include/GrStopwatch.h',
'../third_party/skia/gpu/include/GrStringBuilder.h',
'../third_party/skia/gpu/include/GrTArray.h',
@@ -595,6 +597,7 @@
'../third_party/skia/include/gpu/SkGrTexturePixelRef.h',
'../third_party/skia/include/ports/SkStream_Win.h',
+ '../third_party/skia/include/ports/SkTypeface_win.h',
'../third_party/skia/include/images/SkFlipPixelRef.h',
'../third_party/skia/include/images/SkImageDecoder.h',
@@ -654,6 +657,7 @@
'../third_party/skia/include/effects',
'../third_party/skia/include/gpu',
'../third_party/skia/include/images',
+ '../third_party/skia/include/ports',
'../third_party/skia/include/utils',
'../third_party/skia/gpu/include',
'../third_party/skia/gpu/src',