Put clear and discard into GrBatch.

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 209 matching lines @@
       
       # Batches
       '<(skia_src_path)/gpu/batches/GrAAFillRectBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrAAFillRectBatch.h',
       '<(skia_src_path)/gpu/batches/GrAAStrokeRectBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrAAStrokeRectBatch.h',
       '<(skia_src_path)/gpu/batches/GrBWFillRectBatch.h',
       '<(skia_src_path)/gpu/batches/GrBWFillRectBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrBatch.h',
+      '<(skia_src_path)/gpu/batches/GrClearBatch.h',
+      '<(skia_src_path)/gpu/batches/GrDiscardBatch.h',
       '<(skia_src_path)/gpu/batches/GrDrawBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrDrawBatch.h',
       '<(skia_src_path)/gpu/batches/GrDrawAtlasBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrDrawAtlasBatch.h',
       '<(skia_src_path)/gpu/batches/GrDrawVerticesBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrDrawVerticesBatch.h',
       '<(skia_src_path)/gpu/batches/GrRectBatchFactory.h',
       '<(skia_src_path)/gpu/batches/GrRectBatchFactory.cpp',
       '<(skia_src_path)/gpu/batches/GrStrokeRectBatch.cpp',
       '<(skia_src_path)/gpu/batches/GrStrokeRectBatch.h',
@@ skipping 210 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',
     ],
   },
 }