Roll Skia 2116 -> 2123.

skia/skia.gyp

Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp	(revision 96997)
+++ skia/skia.gyp	(working copy)
@@ -16,6 +16,7 @@
         '../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',
@@ -32,6 +33,7 @@
         '../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',
@@ -39,7 +41,9 @@
         '../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',
@@ -57,6 +61,7 @@
         '../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',
@@ -69,16 +74,12 @@
         '../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',
@@ -109,7 +110,6 @@
         '../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',