Make GrVertexBatch objects hold their own draws during GrDrawTarget flush

gyp/gpu.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # 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
@@ skipping 60 matching lines @@
       '<(skia_src_path)/gpu/GrAtlas.cpp',
       '<(skia_src_path)/gpu/GrAtlas.h',
       '<(skia_src_path)/gpu/GrAtlasTextBlob.cpp',
       '<(skia_src_path)/gpu/GrAtlasTextBlob.h',
       '<(skia_src_path)/gpu/GrAtlasTextContext.cpp',
       '<(skia_src_path)/gpu/GrAtlasTextContext.h',
       '<(skia_src_path)/gpu/GrBatchAtlas.cpp',
       '<(skia_src_path)/gpu/GrBatchAtlas.h',
       '<(skia_src_path)/gpu/GrBatchFontCache.cpp',
       '<(skia_src_path)/gpu/GrBatchFontCache.h',
-      '<(skia_src_path)/gpu/GrBatchTarget.cpp',
-      '<(skia_src_path)/gpu/GrBatchTarget.h',
+      '<(skia_src_path)/gpu/GrBatchFlushState.cpp',
+      '<(skia_src_path)/gpu/GrBatchFlushState.h',
       '<(skia_src_path)/gpu/GrBatchTest.cpp',
       '<(skia_src_path)/gpu/GrBatchTest.h',
       '<(skia_src_path)/gpu/GrBlurUtils.cpp',
       '<(skia_src_path)/gpu/GrBlurUtils.h',
       '<(skia_src_path)/gpu/GrBufferAllocPool.cpp',
       '<(skia_src_path)/gpu/GrBufferAllocPool.h',
       '<(skia_src_path)/gpu/GrBufferedDrawTarget.cpp',
       '<(skia_src_path)/gpu/GrBufferedDrawTarget.h',
       '<(skia_src_path)/gpu/GrCaps.cpp',
       '<(skia_src_path)/gpu/GrClip.cpp',
@@ skipping 357 matching lines @@
       '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
       '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h',
     ],
     'skgpu_null_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
       '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
     ],
   },
 }