summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authortomhudson@google.com <tomhudson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 16:40:16 +0000
committertomhudson@google.com <tomhudson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 16:40:16 +0000
commit8ef8c2750e181c8e3136d43c05b4d69e6c0674ef (patch)
tree1ee7eb5e6193fd38ae9bb7e717c3beb9ca0a56de /skia
parent39f6d67104320bcb53efb5f485af585f83027ebe (diff)
downloadchromium_src-8ef8c2750e181c8e3136d43c05b4d69e6c0674ef.zip
chromium_src-8ef8c2750e181c8e3136d43c05b4d69e6c0674ef.tar.gz
chromium_src-8ef8c2750e181c8e3136d43c05b4d69e6c0674ef.tar.bz2
Rolling skia deps from 2811 to 2836
Review URL: http://codereview.chromium.org/8885035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 471774a..2df7885 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -367,7 +367,8 @@
'../third_party/skia/src/gpu/GrGLRenderTarget.cpp',
'../third_party/skia/src/gpu/GrGLRenderTarget.h',
'../third_party/skia/src/gpu/GrGLStencilBuffer.cpp',
- '../third_party/skia/src/gpu/GrGLStencilBuffer.h',
+ '../third_party/skia/src/gpu/GrGLSL.cpp',
+ '../third_party/skia/src/gpu/GrGLSL.h',
'../third_party/skia/src/gpu/GrGLTexture.cpp',
'../third_party/skia/src/gpu/GrGLTexture.h',
'../third_party/skia/src/gpu/GrGLUtil.cpp',