Revert of GrBatchPrototype

gyp/gpu.gypi

 # Include this gypi to include all 'gpu' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
 #
 {
   'variables': {
     'skgpu_sources': [
@@ skipping 37 matching lines @@
       '<(skia_src_path)/gpu/GrAAConvexPathRenderer.cpp',
       '<(skia_src_path)/gpu/GrAAConvexPathRenderer.h',
       '<(skia_src_path)/gpu/GrAADistanceFieldPathRenderer.cpp',
       '<(skia_src_path)/gpu/GrAADistanceFieldPathRenderer.h',
       '<(skia_src_path)/gpu/GrAARectRenderer.cpp',
       '<(skia_src_path)/gpu/GrAARectRenderer.h',
       '<(skia_src_path)/gpu/GrAddPathRenderers_default.cpp',
       '<(skia_src_path)/gpu/GrAllocator.h',
       '<(skia_src_path)/gpu/GrAtlas.cpp',
       '<(skia_src_path)/gpu/GrAtlas.h',
-      '<(skia_src_path)/gpu/GrBatch.cpp',
-      '<(skia_src_path)/gpu/GrBatch.h',
-      '<(skia_src_path)/gpu/GrBatchTarget.cpp',
-      '<(skia_src_path)/gpu/GrBatchTarget.h',
       '<(skia_src_path)/gpu/GrBitmapTextContext.cpp',
       '<(skia_src_path)/gpu/GrBitmapTextContext.h',
       '<(skia_src_path)/gpu/GrBlend.cpp',
       '<(skia_src_path)/gpu/GrBlend.h',
       '<(skia_src_path)/gpu/GrBufferAllocPool.cpp',
       '<(skia_src_path)/gpu/GrBufferAllocPool.h',
       '<(skia_src_path)/gpu/GrClipData.cpp',
       '<(skia_src_path)/gpu/GrClipMaskCache.h',
       '<(skia_src_path)/gpu/GrClipMaskCache.cpp',
       '<(skia_src_path)/gpu/GrClipMaskManager.h',
       '<(skia_src_path)/gpu/GrClipMaskManager.cpp',
       '<(skia_src_path)/gpu/GrContext.cpp',
       '<(skia_src_path)/gpu/GrCoordTransform.cpp',
       '<(skia_src_path)/gpu/GrDefaultGeoProcFactory.cpp',
       '<(skia_src_path)/gpu/GrDefaultGeoProcFactory.h',
       '<(skia_src_path)/gpu/GrDefaultPathRenderer.cpp',
       '<(skia_src_path)/gpu/GrDefaultPathRenderer.h',
       '<(skia_src_path)/gpu/GrDistanceFieldTextContext.h',
       '<(skia_src_path)/gpu/GrDistanceFieldTextContext.cpp',
       '<(skia_src_path)/gpu/GrDrawTarget.cpp',
       '<(skia_src_path)/gpu/GrDrawTarget.h',
       '<(skia_src_path)/gpu/GrDrawTargetCaps.h',
       '<(skia_src_path)/gpu/GrFlushToGpuDrawTarget.cpp',
       '<(skia_src_path)/gpu/GrFlushToGpuDrawTarget.h',
       '<(skia_src_path)/gpu/GrFontScaler.cpp',
       '<(skia_src_path)/gpu/GrFontScaler.h',
       '<(skia_src_path)/gpu/GrGeometryBuffer.h',
+      '<(skia_src_path)/gpu/GrGeometryData.h',
       '<(skia_src_path)/gpu/GrGeometryProcessor.h',
       '<(skia_src_path)/gpu/GrGeometryProcessor.cpp',
       '<(skia_src_path)/gpu/GrGlyph.h',
       '<(skia_src_path)/gpu/GrGpu.cpp',
       '<(skia_src_path)/gpu/GrGpu.h',
       '<(skia_src_path)/gpu/GrGpuResourceCacheAccess.h',
       '<(skia_src_path)/gpu/GrGpuResource.cpp',
       '<(skia_src_path)/gpu/GrGpuFactory.cpp',
       '<(skia_src_path)/gpu/GrIndexBuffer.h',
       '<(skia_src_path)/gpu/GrInvariantOutput.cpp',
@@ skipping 269 matching lines @@
     ],
     'skgpu_null_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
 
       # Sk files
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.h',
     ],
   },
 }