diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 17:49:50 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 17:49:50 +0000 |
| commit | 8e91f87f1cca887e735bd462742f21a3cb799810 (patch) | |
| tree | 66a1116c27f6385e8c889d19b4aaa6bb6b5cc3eb /skia | |
| parent | 07b7a9f946e8d58940e50f14167dd7ee9632f2c9 (diff) | |
| download | chromium_src-8e91f87f1cca887e735bd462742f21a3cb799810.zip chromium_src-8e91f87f1cca887e735bd462742f21a3cb799810.tar.gz chromium_src-8e91f87f1cca887e735bd462742f21a3cb799810.tar.bz2 | |
Roll Skia to r4102.
Control your roll: https://chromiumcodereview.appspot.com/9252024
Review URL: https://chromiumcodereview.appspot.com/10441122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 46d57c8..4065b4a 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -417,8 +417,11 @@ '../third_party/skia/src/gpu/SkGr.cpp', '../third_party/skia/src/gpu/SkGrFontScaler.cpp', '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp', + '../third_party/skia/src/gpu/effects/Gr1DKernelEffect.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', + '../third_party/skia/src/gpu/effects/GrMorphologyEffect.h', '../third_party/skia/src/gpu/gl/GrGLCaps.cpp', '../third_party/skia/src/gpu/gl/GrGLCaps.h', '../third_party/skia/src/gpu/gl/GrGLContextInfo.cpp', @@ -449,8 +452,7 @@ '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.h', '../third_party/skia/src/gpu/gl/GrGpuGL.cpp', '../third_party/skia/src/gpu/gl/GrGpuGL.h', - '../third_party/skia/src/gpu/gl/GrGpuGLShaders.cpp', - '../third_party/skia/src/gpu/gl/GrGpuGLShaders.h', + '../third_party/skia/src/gpu/gl/GrGpuGL_program.cpp', '../third_party/skia/src/images/bmpdecoderhelper.cpp', '../third_party/skia/src/images/bmpdecoderhelper.h', |