Cleanup GrContextFactory and make it's subclasses private

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 55 matching lines @@
       '<(skia_src_path)/gpu/GrBlend.h',
       '<(skia_src_path)/gpu/GrBufferAllocPool.cpp',
       '<(skia_src_path)/gpu/GrBufferAllocPool.h',
       '<(skia_src_path)/gpu/GrCacheID.cpp',
       '<(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/GrContextFactory.cpp',

[bsalomon, 2014/11/13 17:49:32]

Kind of a bummer to bake this into the main library. Would it work to put this
in gputest.gyp?

[djsollen, 2014/11/13 18:32:15]

Done.

       '<(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/GrDrawState.cpp',
       '<(skia_src_path)/gpu/GrDrawState.h',
       '<(skia_src_path)/gpu/GrDrawTarget.cpp',
       '<(skia_src_path)/gpu/GrDrawTarget.h',
@@ skipping 227 matching lines @@
       '<(skia_src_path)/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
       '<(skia_src_path)/gpu/gl/win/SkCreatePlatformGLContext_win.cpp',
       '<(skia_src_path)/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
       '<(skia_src_path)/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp',
       '<(skia_src_path)/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm',
     ],
     'skgpu_mesa_gl_sources': [
       '<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkMesaGLContext.h',
       '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.h',
     ],
     'skgpu_angle_gl_sources': [
       '<(skia_src_path)/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h',
       '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.h',
     ],
     'skgpu_debug_gl_sources': [
       '<(skia_src_path)/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrFakeRefObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrBufferObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrBufferObj.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrFBBindableObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrRenderBufferObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrTextureObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrTextureObj.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrTextureUnitObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrTextureUnitObj.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrFrameBufferObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrFrameBufferObj.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrShaderObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrShaderObj.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrProgramObj.h',
       '<(skia_src_path)/gpu/gl/debug/GrProgramObj.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrDebugGL.h',
       '<(skia_src_path)/gpu/gl/debug/GrDebugGL.cpp',
       '<(skia_src_path)/gpu/gl/debug/GrVertexArrayObj.h',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkDebugGLContext.h',
       '<(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',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/SkNullGLContext.h',
     ],
   },
 }