From 82642bb1c9402e67e46e0a48bdc075fd505fa36d Mon Sep 17 00:00:00 2001 From: "antonm@chromium.org" Date: Thu, 12 May 2011 13:37:32 +0000 Subject: Revert "Reland 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a surface type independent GLContext::CreateGLContext". git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85124 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/demos/framework/main_exe.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gpu/demos') diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc index 0c54804..93fc51e 100644 --- a/gpu/demos/framework/main_exe.cc +++ b/gpu/demos/framework/main_exe.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "gpu/demos/framework/window.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gfx/gl/gl_context.h" #if defined(OS_LINUX) #include @@ -28,7 +28,7 @@ int main(int argc, char** argv) { CommandLine::Init(argc, argv); - gfx::GLSurface::InitializeOneOff(); + gfx::GLContext::InitializeOneOff(); gpu::demos::Window window; CHECK(window.Init(kWindowWidth, kWindowHeight)); -- cgit v1.1