Rolling skia deps from 2811 to 2836

skia/skia.gyp

 # Copyright (c) 2011 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)',
       'sources': [
@@ skipping 349 matching lines @@
         '../third_party/skia/src/gpu/GrGLDefaultInterface_none.cpp',
         '../third_party/skia/src/gpu/GrGLIndexBuffer.cpp',
         '../third_party/skia/src/gpu/GrGLIndexBuffer.h',
         '../third_party/skia/src/gpu/GrGLInterface.cpp',
         '../third_party/skia/src/gpu/GrGLIRect.h',
         '../third_party/skia/src/gpu/GrGLProgram.cpp',
         '../third_party/skia/src/gpu/GrGLProgram.h',
         '../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',
         '../third_party/skia/src/gpu/GrGLVertexBuffer.cpp',
         '../third_party/skia/src/gpu/GrGLVertexBuffer.h',
         '../third_party/skia/src/gpu/GrGpu.cpp',
         '../third_party/skia/src/gpu/GrGpu.h',
         '../third_party/skia/src/gpu/GrGpuFactory.cpp',
         '../third_party/skia/src/gpu/GrGpuGL.cpp',
         '../third_party/skia/src/gpu/GrGpuGL.h',
@@ skipping 728 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }