Take GL version and extensions correctly into account when binding functions

ui/gl/gl_surface.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_surface.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
 #include "ui/gl/gl_context.h"
-#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
 namespace {
 base::LazyInstance<base::ThreadLocalPointer<GLSurface> >::Leaky
     current_surface_ = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 // static
 bool GLSurface::InitializeOneOff() {
@@ skipping 21 matching lines @@
       impl = GetNamedGLImplementation(requested_implementation_name);
       if (std::find(allowed_impls.begin(),
                     allowed_impls.end(),
                     impl) == allowed_impls.end()) {
         LOG(ERROR) << "Requested GL implementation is not available.";
         return false;
       }
     }
   }
 
-  initialized = InitializeGLBindings(impl) && InitializeOneOffInternal();
+  initialized = InitializePreBindingsInternal(impl);

[no sievers, 2014/01/14 23:16:01]

Adding InitializePreBindingsInternal() everywhere makes the code a bit harder to
follow (and it's already pretty confusing). Would it work to simply call
GLSurfaceWGL::InitializeOneOff() from gl_implementation_win.cc?

[oetuaho-nv, 2014/01/15 15:50:25]

I agree, done.

+  if (initialized)
+    initialized = InitializeStaticGLBindings(impl) &&
+                  InitializeOneOffInternal();
   if (!initialized && fallback_to_osmesa) {
     ClearGLBindings();
-    initialized = InitializeGLBindings(kGLImplementationOSMesaGL) &&
+    initialized = InitializeStaticGLBindings(kGLImplementationOSMesaGL) &&
                   InitializeOneOffInternal();
   }
 
   if (initialized) {
     DVLOG(1) << "Using "
              << GetGLImplementationName(GetGLImplementation())
              << " GL implementation.";
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableGPUServiceLogging))
       InitializeDebugGLBindings();
@@ skipping 185 matching lines @@
   return surface_->GetFormat();
 }
 
 VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
   return surface_->GetVSyncProvider();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
 }  // namespace gfx