GLContext no longer holds a pointer to a GLSurface.

content/gpu/gpu_info_collector.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 "content/gpu/gpu_info_collector.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 
 namespace {
 
-// This creates an offscreen GL context for gl queries.  Returned GLContext
-// should be deleted in FinalizeGLContext.
-gfx::GLContext* InitializeGLContext() {
-  if (!gfx::GLSurface::InitializeOneOff()) {
-    LOG(ERROR) << "gfx::GLContext::InitializeOneOff() failed";
-    return NULL;
-  }
+gfx::GLSurface* InitializeGLSurface() {
   scoped_ptr<gfx::GLSurface> surface(gfx::GLSurface::CreateOffscreenGLSurface(
       gfx::Size(1, 1)));
   if (!surface.get()) {
     LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed";
     return NULL;
   }
 
-  scoped_ptr<gfx::GLContext> context(gfx::GLContext::CreateGLContext(
-      surface.release(),
-      NULL));
+  return surface.release();
+}
+
+gfx::GLContext* InitializeGLContext(gfx::GLSurface* surface) {
+
+  scoped_ptr<gfx::GLContext> context(gfx::GLContext::CreateGLContext(NULL,
+                                                                     surface));
   if (!context.get()) {
     LOG(ERROR) << "gfx::GLContext::CreateGLContext failed";
     return NULL;
   }
 
-  if (!context->MakeCurrent()) {
+  if (!context->MakeCurrent(surface)) {
     LOG(ERROR) << "gfx::GLContext::MakeCurrent() failed";
     return NULL;
   }
 
   return context.release();
 }
 
 std::string GetGLString(unsigned int pname) {
   const char* gl_string =
       reinterpret_cast<const char*>(glGetString(pname));
@@ skipping 20 matching lines @@
   return "";
 }
 
 }  // namespace anonymous
 
 namespace gpu_info_collector {
 
 bool CollectGraphicsInfoGL(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
-  scoped_ptr<gfx::GLContext> context(InitializeGLContext());
+  if (!gfx::GLSurface::InitializeOneOff()) {
+    LOG(ERROR) << "gfx::GLContext::InitializeOneOff() failed";
+    return false;
+  }
+
+  scoped_ptr<gfx::GLSurface> surface(InitializeGLSurface());
+  if (!surface.get())
+    return false;
+
+  scoped_ptr<gfx::GLContext> context(InitializeGLContext(surface.get()));
   if (!context.get())
     return false;
 
   gpu_info->gl_renderer = GetGLString(GL_RENDERER);
   gpu_info->gl_vendor = GetGLString(GL_VENDOR);
   gpu_info->gl_version_string =GetGLString(GL_VERSION);
   gpu_info->gl_extensions =GetGLString(GL_EXTENSIONS);
 
   bool validGLVersionInfo = CollectGLVersionInfo(gpu_info);
   bool validVideoCardInfo = CollectVideoCardInfo(gpu_info);
@@ skipping 13 matching lines @@
 
   std::string glsl_version = GetVersionFromString(glsl_version_string);
   gpu_info->pixel_shader_version = glsl_version;
   gpu_info->vertex_shader_version = glsl_version;
 
   return true;
 }
 
 }  // namespace gpu_info_collector