Roll Skia to r4102.

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 399 matching lines @@
         '../third_party/skia/src/gpu/GrTextStrike.cpp',
         '../third_party/skia/src/gpu/GrTextStrike.h',
         '../third_party/skia/src/gpu/GrTextStrike_impl.h',
         '../third_party/skia/src/gpu/GrTexture.cpp',
         '../third_party/skia/src/gpu/GrVertexBuffer.h',
         '../third_party/skia/src/gpu/SkGpuCanvas.cpp',
         '../third_party/skia/src/gpu/SkGpuDevice.cpp',
         '../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',
         '../third_party/skia/src/gpu/gl/GrGLContextInfo.h',
         '../third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
         '../third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp',
         '../third_party/skia/src/gpu/gl/GrGLDefines.h',
         '../third_party/skia/src/gpu/gl/GrGLIRect.h',
         '../third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp',
         '../third_party/skia/src/gpu/gl/GrGLIndexBuffer.h',
@@ skipping 10 matching lines @@
         '../third_party/skia/src/gpu/gl/GrGLShaderBuilder.h',
         '../third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp',
         '../third_party/skia/src/gpu/gl/GrGLTexture.cpp',
         '../third_party/skia/src/gpu/gl/GrGLTexture.h',
         '../third_party/skia/src/gpu/gl/GrGLUtil.cpp',
         '../third_party/skia/src/gpu/gl/GrGLUtil.h',
         '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp',
         '../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',
         #'../third_party/skia/src/images/SkFDStream.cpp',
         #'../third_party/skia/src/images/SkFlipPixelRef.cpp',
         '../third_party/skia/src/images/SkImageDecoder.cpp',
         '../third_party/skia/src/images/SkImageDecoder_Factory.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_fpdfemb.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libbmp.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libgif.cpp',
@@ skipping 800 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }