Roll Skia 2123->2128

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': [
         '../third_party/skia/gpu/src/GrAllocPool.cpp',
         '../third_party/skia/gpu/src/GrAtlas.cpp',
         '../third_party/skia/gpu/src/GrBufferAllocPool.cpp',
         '../third_party/skia/gpu/src/GrBufferAllocPool.h',
         '../third_party/skia/gpu/src/GrClip.cpp',
         '../third_party/skia/gpu/src/GrContext.cpp',
         '../third_party/skia/gpu/src/GrCreatePathRenderer_none.cpp',
         '../third_party/skia/gpu/src/GrDrawTarget.cpp',
+        '../third_party/skia/gpu/src/GrGeometryBuffer.h',
         '../third_party/skia/gpu/src/GrGLDefaultInterface_none.cpp',
         '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
         '../third_party/skia/gpu/src/GrGLIndexBuffer.h',
         '../third_party/skia/gpu/src/GrGLInterface.cpp',
         '../third_party/skia/gpu/src/GrGLIRect.h',
         '../third_party/skia/gpu/src/GrGLProgram.cpp',
         '../third_party/skia/gpu/src/GrGLProgram.h',
         '../third_party/skia/gpu/src/GrGLRenderTarget.cpp',
         '../third_party/skia/gpu/src/GrGLRenderTarget.h',
         '../third_party/skia/gpu/src/GrGLStencilBuffer.h',
         '../third_party/skia/gpu/src/GrGLTexture.cpp',
         '../third_party/skia/gpu/src/GrGLTexture.h',
         '../third_party/skia/gpu/src/GrGLUtil.cpp',
         '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
         '../third_party/skia/gpu/src/GrGLVertexBuffer.h',
         '../third_party/skia/gpu/src/GrGpu.cpp',
+        '../third_party/skia/gpu/src/GrGpu.h',
         '../third_party/skia/gpu/src/GrGpuFactory.cpp',
         '../third_party/skia/gpu/src/GrGpuGL.cpp',
         '../third_party/skia/gpu/src/GrGpuGL.h',
         '../third_party/skia/gpu/src/GrGpuGLFixed.cpp',
         '../third_party/skia/gpu/src/GrGpuGLFixed.h',
         '../third_party/skia/gpu/src/GrGpuGLShaders.cpp',
         '../third_party/skia/gpu/src/GrGpuGLShaders.h',
+        '../third_party/skia/gpu/src/GrIndexBuffer.h',
         '../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
+        '../third_party/skia/gpu/src/GrInOrderDrawBuffer.h',
         '../third_party/skia/gpu/src/GrMatrix.cpp',
         '../third_party/skia/gpu/src/GrMemory.cpp',
         '../third_party/skia/gpu/src/GrPathRenderer.cpp',
         '../third_party/skia/gpu/src/GrPathUtils.cpp',
         '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
         '../third_party/skia/gpu/src/GrRenderTarget.cpp',
         '../third_party/skia/gpu/src/GrResource.cpp',
         '../third_party/skia/gpu/src/GrResourceCache.cpp',
         '../third_party/skia/gpu/src/GrResourceCache.h',
         '../third_party/skia/gpu/src/GrStencil.cpp',
         '../third_party/skia/gpu/src/GrStencilBuffer.cpp',
         '../third_party/skia/gpu/src/GrStencilBuffer.h',
         '../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp',
         '../third_party/skia/gpu/src/GrTexture.cpp',
         '../third_party/skia/gpu/src/GrTextContext.cpp',
         '../third_party/skia/gpu/src/GrTextStrike.cpp',
         '../third_party/skia/gpu/src/GrTextStrike_impl.h',
+        '../third_party/skia/gpu/src/GrVertexBuffer.h',
 
         '../third_party/skia/gpu/include/GrAllocPool.h',
         '../third_party/skia/gpu/include/GrAllocator.h',
         '../third_party/skia/gpu/include/GrAtlas.h',
         '../third_party/skia/gpu/include/GrClip.h',
         '../third_party/skia/gpu/include/GrClipIterator.h',
         '../third_party/skia/gpu/include/GrColor.h',
         '../third_party/skia/gpu/include/GrConfig.h',
         '../third_party/skia/gpu/include/GrContext.h',
-        '../third_party/skia/gpu/include/GrContext_impl.h',
         '../third_party/skia/gpu/include/GrDrawTarget.h',
         '../third_party/skia/gpu/include/GrFontScaler.h',
-        '../third_party/skia/gpu/include/GrGeometryBuffer.h',
         '../third_party/skia/gpu/include/GrGLConfig.h',
         '../third_party/skia/gpu/include/GrGLConfig_chrome.h',
         '../third_party/skia/gpu/include/GrGLInterface.h',
         '../third_party/skia/gpu/include/GrGlyph.h',
-        '../third_party/skia/gpu/include/GrGpu.h',
         '../third_party/skia/gpu/include/GrGpuVertex.h',
         '../third_party/skia/gpu/include/GrIPoint.h',
-        '../third_party/skia/gpu/include/GrInOrderDrawBuffer.h',
-        '../third_party/skia/gpu/include/GrIndexBuffer.h',
         '../third_party/skia/gpu/include/GrInstanceCounter.h',
         '../third_party/skia/gpu/include/GrKey.h',
         '../third_party/skia/gpu/include/GrMatrix.h',
         '../third_party/skia/gpu/include/GrMesh.h',
         '../third_party/skia/gpu/include/GrNoncopyable.h',
         '../third_party/skia/gpu/include/GrPaint.h',
         '../third_party/skia/gpu/include/GrPath.h',
         '../third_party/skia/gpu/include/GrPathSink.h',
         '../third_party/skia/gpu/include/GrPoint.h',
         '../third_party/skia/gpu/include/GrRandom.h',
@@ skipping 10 matching lines @@
         '../third_party/skia/gpu/include/GrTBSearch.h',
         '../third_party/skia/gpu/include/GrTDArray.h',
         '../third_party/skia/gpu/include/GrTHashCache.h',
         '../third_party/skia/gpu/include/GrTLList.h',
         '../third_party/skia/gpu/include/GrTesselatedPathRenderer.h',
         '../third_party/skia/gpu/include/GrTextContext.h',
         '../third_party/skia/gpu/include/GrTextStrike.h',
         '../third_party/skia/gpu/include/GrTexture.h',
         '../third_party/skia/gpu/include/GrTypes.h',
         '../third_party/skia/gpu/include/GrUserConfig.h',
-        '../third_party/skia/gpu/include/GrVertexBuffer.h',
 
         #'../third_party/skia/src/animator/SkAnimate.h',
         #'../third_party/skia/src/animator/SkAnimateActive.cpp',
         #'../third_party/skia/src/animator/SkAnimateActive.h',
         #'../third_party/skia/src/animator/SkAnimateBase.cpp',
         #'../third_party/skia/src/animator/SkAnimateBase.h',
         #'../third_party/skia/src/animator/SkAnimateField.cpp',
         #'../third_party/skia/src/animator/SkAnimateMaker.cpp',
         #'../third_party/skia/src/animator/SkAnimateMaker.h',
         #'../third_party/skia/src/animator/SkAnimateProperties.h',
@@ skipping 877 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }