Roll Skia to r4771.

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 369 matching lines @@
         '../third_party/skia/src/gpu/GrDrawTarget.h',
         '../third_party/skia/src/gpu/GrGeometryBuffer.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/GrInOrderDrawBuffer.cpp',
         '../third_party/skia/src/gpu/GrInOrderDrawBuffer.h',
         '../third_party/skia/src/gpu/GrIndexBuffer.h',
         '../third_party/skia/src/gpu/GrMatrix.cpp',
         '../third_party/skia/src/gpu/GrMemory.cpp',
+        '../third_party/skia/src/gpu/GrMemoryPool.cpp',
+        '../third_party/skia/src/gpu/GrMemoryPool.h',
         '../third_party/skia/src/gpu/GrPathRenderer.cpp',
         '../third_party/skia/src/gpu/GrPathRenderer.h',
         '../third_party/skia/src/gpu/GrPathRendererChain.cpp',
         '../third_party/skia/src/gpu/GrPathRendererChain.h',
         '../third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp',
         '../third_party/skia/src/gpu/GrSoftwarePathRenderer.h',
         '../third_party/skia/src/gpu/GrSWMaskHelper.cpp',
         '../third_party/skia/src/gpu/GrSWMaskHelper.h',
         '../third_party/skia/src/gpu/GrPath.h',
         '../third_party/skia/src/gpu/GrPathUtils.cpp',
@@ skipping 61 matching lines @@
         '../third_party/skia/src/gpu/gl/GrGLProgramStage.h',
         '../third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp',
         '../third_party/skia/src/gpu/gl/GrGLRenderTarget.h',
         '../third_party/skia/src/gpu/gl/GrGLSL.cpp',
         '../third_party/skia/src/gpu/gl/GrGLSL.h',
         '../third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp',
         '../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/GrGLUniformManager.cpp',
+        '../third_party/skia/src/gpu/gl/GrGLUniformManager.h',
+        '../third_party/skia/src/gpu/gl/GrGLUniformHandle.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/GrGpuGL_program.cpp',
 
         '../third_party/skia/src/images/bmpdecoderhelper.cpp',
         '../third_party/skia/src/images/bmpdecoderhelper.h',
@@ skipping 823 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }