Revert "Turn NVPR on by default (but off in tools)."

include/gpu/gl/GrGLInterface.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLInterface_DEFINED
 #define GrGLInterface_DEFINED
 
@@ skipping 54 matching lines @@
  * Creates a debugging GrGLInterface that doesn't draw anything. Used for
  * finding memory leaks and invalid memory accesses.
  */
 const GrGLInterface* GrGLCreateDebugInterface();
 
 #if GR_GL_PER_GL_FUNC_CALLBACK
 typedef void (*GrGLInterfaceCallbackProc)(const GrGLInterface*);
 typedef intptr_t GrGLInterfaceCallbackData;
 #endif
 
-/** Function that returns a new interface identical to "interface" but without support for
-    GL_NV_path_rendering. */
-const GrGLInterface* GrGLInterfaceRemoveNVPR(const GrGLInterface* interface);
-
-/**
+/*
  * GrContext uses the following interface to make all calls into OpenGL. When a
  * GrContext is created it is given a GrGLInterface. The interface's function
  * pointers must be valid for the OpenGL context associated with the GrContext.
  * On some platforms, such as Windows, function pointers for OpenGL extensions
  * may vary between OpenGL contexts. So the caller must be careful to use a
  * GrGLInterface initialized for the correct context. All functions that should
  * be available based on the OpenGL's version and extension string must be
  * non-NULL or GrContext creation will fail. This can be tested with the
  * validate() method when the OpenGL context has been made current.
  */
@@ skipping 19 matching lines @@
         GLPtr<FNPTR_TYPE>* fBase;
     };
 
     typedef SkRefCnt INHERITED;
 
 public:
     SK_DECLARE_INST_COUNT(GrGLInterface)
 
     GrGLInterface();
 
-    static GrGLInterface* NewClone(const GrGLInterface*);
-
     // Validates that the GrGLInterface supports its advertised standard. This means the necessary
     // function pointers have been initialized for both the GL version and any advertised
     // extensions.
     bool validate() const;
 
     // Indicates the type of GL implementation
     union {
         GrGLStandard fStandard;
         GrGLStandard fBindingsExported; // Legacy name, will be remove when Chromium is updated.
     };
@@ skipping 226 matching lines @@
         GLPtr<GrGLGetPathColorGenivProc> fGetPathColorGeniv;
         GLPtr<GrGLGetPathColorGenfvProc> fGetPathColorGenfv;
         GLPtr<GrGLGetPathTexGenivProc> fGetPathTexGeniv;
         GLPtr<GrGLGetPathTexGenfvProc> fGetPathTexGenfv;
         GLPtr<GrGLIsPointInFillPathProc> fIsPointInFillPath;
         GLPtr<GrGLIsPointInStrokePathProc> fIsPointInStrokePath;
         GLPtr<GrGLGetPathLengthProc> fGetPathLength;
         GLPtr<GrGLPointAlongPathProc> fPointAlongPath;
     } fFunctions;
 
+
     // Temporary workaround aliases to keep Chromium GrGLInterface factories compiling until they
     // assign the members of fFunctions.
     GLPtrAlias<GrGLActiveTextureProc> fActiveTexture;
     GLPtrAlias<GrGLAttachShaderProc> fAttachShader;
     GLPtrAlias<GrGLBeginQueryProc> fBeginQuery;
     GLPtrAlias<GrGLBindAttribLocationProc> fBindAttribLocation;
     GLPtrAlias<GrGLBindBufferProc> fBindBuffer;
     GLPtrAlias<GrGLBindFragDataLocationProc> fBindFragDataLocation;
     GLPtrAlias<GrGLBindFragDataLocationIndexedProc> fBindFragDataLocationIndexed;
     GLPtrAlias<GrGLBindFramebufferProc> fBindFramebuffer;
@@ skipping 178 matching lines @@
 
     // Per-GL func callback
 #if GR_GL_PER_GL_FUNC_CALLBACK
     GrGLInterfaceCallbackProc fCallback;
     GrGLInterfaceCallbackData fCallbackData;
 #endif
 
 };
 
 #endif