summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authortwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 14:59:00 +0000
committertwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 14:59:00 +0000
commit3be74a00516016a7df0b5f3e4996c349e16e957d (patch)
tree2835372721b7e0cefa33058f23856aba883b7e64 /skia
parentd55917908e06bf543c941bf0f6e0f2648eeeece8 (diff)
downloadchromium_src-3be74a00516016a7df0b5f3e4996c349e16e957d.zip
chromium_src-3be74a00516016a7df0b5f3e4996c349e16e957d.tar.gz
chromium_src-3be74a00516016a7df0b5f3e4996c349e16e957d.tar.bz2
Roll skia to 4683.
Reference change-set: http://codereview.chromium.org/10804035/ BUG=138159 R=senorblanco@chromium.org Review URL: https://chromiumcodereview.appspot.com/10815016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 5b85187..b12fb7d 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -430,6 +430,8 @@
'../third_party/skia/src/gpu/SkGrPixelRef.cpp',
'../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
'../third_party/skia/src/gpu/effects/Gr1DKernelEffect.h',
+ '../third_party/skia/src/gpu/effects/GrColorTableEffect.cpp',
+ '../third_party/skia/src/gpu/effects/GrColorTableEffect.h',
'../third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp',
'../third_party/skia/src/gpu/effects/GrConvolutionEffect.h',
'../third_party/skia/src/gpu/effects/GrMorphologyEffect.cpp',