Take GL version and extensions correctly into account when binding functions

ui/gl/gl_surface_win.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 <dwmapi.h>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 64 matching lines @@
           base::Time::kMicrosecondsPerSecond /
           timing_info.rateRefresh.uiNumerator);
       callback.Run(timebase, interval);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DWMVSyncProvider);
 };
 
-// Helper routine that does one-off initialization like determining the
-// pixel format and initializing the GL bindings.
-bool GLSurface::InitializeOneOffInternal() {
-  switch (GetGLImplementation()) {
-    case kGLImplementationDesktopGL:
-      if (!GLSurfaceWGL::InitializeOneOff()) {
-        LOG(ERROR) << "GLSurfaceWGL::InitializeOneOff failed.";
-        return false;
-      }
-      break;
-    case kGLImplementationEGLGLES2:
-      if (!GLSurfaceEGL::InitializeOneOff()) {
-        LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
-        return false;
-      }
-      break;
+// Helper routine that does one-off initialization like determining the pixel
+// format, executed before the GL bindings are initialized.
+bool GLSurface::InitializePreBindingsInternal(GLImplementation impl) {
+  if (impl == kGLImplementationDesktopGL) {
+    // The surface needs to be initialized in order to create a context needed
+    // for initializing bindings.
+    if (!GLSurfaceWGL::InitializeOneOff()) {
+      LOG(ERROR) << "GLSurfaceWGL::InitializeOneOff failed.";
+      return false;
+    }
   }
   return true;
 }
+
+bool GLSurface::InitializeOneOffInternal() {
+  if (GetGLImplementation() == kGLImplementationEGLGLES2) {
+    if (!GLSurfaceEGL::InitializeOneOff()) {
+      LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
+      return false;
+    }
+  }
+  return true;
+}
 
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
     gfx::AcceleratedWidget window)
   : GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size(1, 1)),
     window_(window),
     device_context_(NULL) {
   DCHECK(window);
 }
 
 NativeViewGLSurfaceOSMesa::~NativeViewGLSurfaceOSMesa() {
@@ skipping 168 matching lines @@
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx