Respect the disabled extension list during binding initialization.

ui/gl/gl_egl_api_implementation.cc

 // Copyright (c) 2012 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 "ui/gl/gl_egl_api_implementation.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
 RealEGLApi* g_real_egl;
 
 void InitializeStaticGLBindingsEGL() {
+  g_driver_egl.InitializeStaticBindings();
   if (!g_real_egl) {
     g_real_egl = new RealEGLApi();
   }
   g_real_egl->Initialize(&g_driver_egl);
   g_current_egl_context = g_real_egl;
-  g_driver_egl.InitializeStaticBindings();
-
+  g_driver_egl.InitializeExtensionBindings(g_real_egl->GetEnabledExtensions());
   g_real_egl->InitializeFilteredExtensions();
 }
 
 void InitializeDebugGLBindingsEGL() {
   g_driver_egl.InitializeDebugBindings();
 }
 
 void ClearGLBindingsEGL() {
   if (g_real_egl) {
     delete g_real_egl;
@@ skipping 72 matching lines @@
   }
 }
 
 const char* RealEGLApi::eglQueryStringFn(EGLDisplay dpy, EGLint name) {
   if (!filtered_exts_.empty() && name == EGL_EXTENSIONS) {
     return filtered_exts_.c_str();
   }
   return EGLApiBase::eglQueryStringFn(dpy, name);
 }
 
+std::set<std::string> RealEGLApi::GetEnabledExtensions() const {

[no sievers, 2015/06/23 20:48:25]

This is basically duplicated code, see InitializeFilteredExtensions() above. Do
you just need to use filtered_exts_ and change the init order above?

+  std::set<std::string> enabled_extensions;
+
+  std::vector<std::string> platform_extensions_vec;
+  std::string platform_ext = DriverEGL::GetPlatformExtensions();
+  base::SplitString(platform_ext, ' ', &platform_extensions_vec);
+
+  std::vector<std::string> client_extensions_vec;
+  std::string client_ext = DriverEGL::GetClientExtensions();
+  base::SplitString(client_ext, ' ', &client_extensions_vec);
+
+  enabled_extensions.insert(platform_extensions_vec.begin(),
+                            platform_extensions_vec.end());
+  enabled_extensions.insert(client_extensions_vec.begin(),
+                            client_extensions_vec.end());
+
+  for (auto ext : disabled_exts_) {
+    enabled_extensions.erase(ext);
+  }
+
+  return enabled_extensions;
+}
+
 TraceEGLApi::~TraceEGLApi() {
 }
 
 bool GetGLWindowSystemBindingInfoEGL(GLWindowSystemBindingInfo* info) {
   EGLDisplay display = eglGetCurrentDisplay();
   const char* vendor = eglQueryString(display, EGL_VENDOR);
   const char* version = eglQueryString(display, EGL_VERSION);
   const char* extensions = eglQueryString(display, EGL_EXTENSIONS);
   *info = GLWindowSystemBindingInfo();
   if (vendor)
     info->vendor = vendor;
   if (version)
     info->version = version;
   if (extensions)
     info->extensions = extensions;
   return true;
 }
 
 }  // namespace gfx