Add GrGLCreateNullInterface.cpp back to gyp, and put contents in namespace.

src/gpu/gl/GrGLCreateNullInterface.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "gl/GrGLInterface.h"
 #include "GrGLDefines.h"
 #include "SkTDArray.h"
 #include "GrGLNoOpInterface.h"
 #include "SkTLS.h"
 
+// TODO: Delete this file after chrome starts using SkNullGLContext.
+
+// added to suppress 'no previous prototype' warning and because this code is duplicated in

[bsalomon, 2015/02/11 20:01:27]

Not entirely sure this is necessary but seemed safer.

+// SkNullGLContext.cpp
+namespace {      
+
 class BufferObj {
 public:
     SK_DECLARE_INST_COUNT(BufferObj);
 
     BufferObj(GrGLuint id) : fID(id), fDataPtr(NULL), fSize(0), fMapped(false) {
     }
     ~BufferObj() { SkDELETE_ARRAY(fDataPtr); }
 
     void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) {
         if (fDataPtr) {
@@ skipping 109 matching lines @@
         , fCurrProgramID(0)
         , fCurrShaderID(0) {}
 
 private:
     static void* Create() { return SkNEW(ThreadContext ); }
     static void Delete(void* context) { SkDELETE(reinterpret_cast<ThreadContext *>(context)); }
 };
 
 // Functions not declared in GrGLBogusInterface.h (not common with the Debug GL interface).
 
-namespace { // added to suppress 'no previous prototype' warning
-
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLActiveTexture(GrGLenum texture) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLAttachShader(GrGLuint program, GrGLuint shader) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLBeginQuery(GrGLenum target, GrGLuint id) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindAttribLocation(GrGLuint program, GrGLuint index, const char* name) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindTexture(GrGLenum target, GrGLuint texture) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindVertexArray(GrGLuint id) {}
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLGenBuffers(GrGLsizei n, GrGLuint* ids) {
     ThreadContext* ctx = ThreadContext::Get();
     for (int i = 0; i < n; ++i) {
@@ skipping 320 matching lines @@
     functions->fBlitFramebuffer = noOpGLBlitFramebuffer;
     functions->fResolveMultisampleFramebuffer = noOpGLResolveMultisampleFramebuffer;
     functions->fMatrixLoadf = noOpGLMatrixLoadf;
     functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity;
     functions->fBindFragDataLocationIndexed = noOpGLBindFragDataLocationIndexed;
 
     interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functions->fGetStringi,
                                 functions->fGetIntegerv);
     return interface;
 }