Split GrDrawState and GrOptDrawState into separate classes and remove base class.

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 114 matching lines @@
       '<(skia_src_path)/gpu/GrRectanizer_skyline.cpp',
       '<(skia_src_path)/gpu/GrRectanizer_skyline.h',
       '<(skia_src_path)/gpu/GrRedBlackTree.h',
       '<(skia_src_path)/gpu/GrRenderTarget.cpp',
       '<(skia_src_path)/gpu/GrReducedClip.cpp',
       '<(skia_src_path)/gpu/GrReducedClip.h',
       '<(skia_src_path)/gpu/GrResourceCache.cpp',
       '<(skia_src_path)/gpu/GrResourceCache.h',
       '<(skia_src_path)/gpu/GrResourceCache2.cpp',
       '<(skia_src_path)/gpu/GrResourceCache2.h',
-      '<(skia_src_path)/gpu/GrRODrawState.cpp',
-      '<(skia_src_path)/gpu/GrRODrawState.h',
       '<(skia_src_path)/gpu/GrStencil.cpp',
       '<(skia_src_path)/gpu/GrStencil.h',
       '<(skia_src_path)/gpu/GrStencilAndCoverPathRenderer.cpp',
       '<(skia_src_path)/gpu/GrStencilAndCoverPathRenderer.h',
       '<(skia_src_path)/gpu/GrStencilAndCoverTextContext.cpp',
       '<(skia_src_path)/gpu/GrStencilAndCoverTextContext.h',
       '<(skia_src_path)/gpu/GrStencilBuffer.cpp',
       '<(skia_src_path)/gpu/GrStencilBuffer.h',
       '<(skia_src_path)/gpu/GrStrokeInfo.h',
       '<(skia_src_path)/gpu/GrTBSearch.h',
@@ skipping 203 matching lines @@
     ],
     'skgpu_null_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
 
       # Sk files
       '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
     ],
   },
 }