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

src/gpu/gl/win/SkNativeGLContext_win.cpp

Index: src/gpu/gl/win/SkNativeGLContext_win.cpp
diff --git a/src/gpu/gl/win/SkNativeGLContext_win.cpp b/src/gpu/gl/win/SkNativeGLContext_win.cpp
index bae97a780c0b09e78d5108a7eaab4619128b96cb..17b4e4ad9b9f89bd55211110747dc6c57c994a10 100644
--- a/src/gpu/gl/win/SkNativeGLContext_win.cpp
+++ b/src/gpu/gl/win/SkNativeGLContext_win.cpp
@@ -86,8 +86,10 @@ const GrGLInterface* SkNativeGLContext::createGLContext() {
         return NULL;
     }
 
-    // Requesting a Core profile would bar us from using NVPR. So we pass false.
-    if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0, false))) {
+    // We don't want the core profile when using NV path rendering (since
+    // NV path rendering relies on fixed function calls)
+    if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0,
+                                                !GR_GL_USE_NV_PATH_RENDERING))) {
         SkDebugf("Could not create rendering context.\n");
         this->destroyGLContext();
         return NULL;