diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 19:41:58 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 19:41:58 +0000 |
| commit | 333c5c9ca65425d1796d9d13abda37ecbce2c9fb (patch) | |
| tree | 85b92482a6ed18f7be48b153352436be89eb5b3e /gpu/demos | |
| parent | 374d9094395c15cd3b337de5c36587312fcc8a1e (diff) | |
| download | chromium_src-333c5c9ca65425d1796d9d13abda37ecbce2c9fb.zip chromium_src-333c5c9ca65425d1796d9d13abda37ecbce2c9fb.tar.gz chromium_src-333c5c9ca65425d1796d9d13abda37ecbce2c9fb.tar.bz2 | |
Revert 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a surface type independent GLContext::CreateGLContext.
TEST=webgl on windows and mac, trybots
BUG=none
Review URL: http://codereview.chromium.org/6997003
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/7015003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
| -rw-r--r-- | gpu/demos/framework/main_exe.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 <gtk/gtk.h> @@ -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)); |