Move GrGLExtensions from GrGLContextInfo to GrGLInterface

src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp

 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLUtil.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include <EGL/egl.h>
 
-static const GrGLInterface* create_es_interface(GrGLVersion version,
-                                                const GrGLExtensions& extensions) {
+static GrGLInterface* create_es_interface(GrGLVersion version,
+                                          const GrGLExtensions& extensions) {
     if (version < GR_GL_VER(2,0)) {
         return NULL;
     }
 
     GrGLInterface* interface = SkNEW(GrGLInterface);
     interface->fStandard = kGLES_GrGLStandard;
 
     interface->fActiveTexture = glActiveTexture;
     interface->fAttachShader = glAttachShader;
     interface->fBindAttribLocation = glBindAttribLocation;
@@ skipping 153 matching lines @@
     interface->fMapBuffer = glMapBufferOES;
     interface->fUnmapBuffer = glUnmapBufferOES;
 #else
     interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
     interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES");
 #endif
 
     return interface;
 }
 
-static const GrGLInterface* create_desktop_interface(GrGLVersion version,
-                                                     const GrGLExtensions& extensions) {
+static GrGLInterface* create_desktop_interface(GrGLVersion version,
+                                               const GrGLExtensions& extensions) {
     // Currently this assumes a 4.4 context or later. Supporting lower GL versions would require
     // getting suffixed versions of pointers for supported extensions.
     if (version < GR_GL_VER(4,4)) {
         return NULL;
     }
 
     GrGLInterface* interface = SkNEW(GrGLInterface);
     interface->fStandard = kGL_GrGLStandard;
 
     interface->fActiveTexture = (GrGLActiveTextureProc) eglGetProcAddress("glActiveTexture");
@@ skipping 189 matching lines @@
 
     const char* verStr = reinterpret_cast<const char*>(glGetString(GR_GL_VERSION));
     GrGLVersion version = GrGLGetVersionFromString(verStr);
     GrGLStandard standard = GrGLGetStandardInUseFromString(verStr);
 
     GrGLExtensions extensions;
     if (!extensions.init(standard, glGetString, getStringi, glGetIntegerv)) {
         return NULL;
     }
 
+    GrGLInterface* interface = NULL;
     if (kGLES_GrGLStandard == standard) {
-        return create_es_interface(version, extensions);
+        interface = create_es_interface(version, extensions);
     } else if (kGL_GrGLStandard == standard) {
-        return create_desktop_interface(version, extensions);
-    } else {
-        return NULL;
+        interface = create_desktop_interface(version, extensions);
     }
+
+    if (NULL != interface) {
+        interface->fExtensions.swap(&extensions);
+    }
+
+    return interface;
 }