summaryrefslogtreecommitdiffstats
path: root/gpu/demos
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 19:22:37 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 19:22:37 +0000
commit92c2bc5ac0f605a14dfa88649e7c5a844eb0922b (patch)
tree814efb2ec279b176a052713fba9ae8d000265116 /gpu/demos
parentb6793a8d2f4af8c0ca6cfca6fbe3168f5de75b5e (diff)
downloadchromium_src-92c2bc5ac0f605a14dfa88649e7c5a844eb0922b.zip
chromium_src-92c2bc5ac0f605a14dfa88649e7c5a844eb0922b.tar.gz
chromium_src-92c2bc5ac0f605a14dfa88649e7c5a844eb0922b.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
-rw-r--r--gpu/demos/framework/main_exe.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc
index 93fc51e..0c54804 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_context.h"
+#include "ui/gfx/gl/gl_surface.h"
#if defined(OS_LINUX)
#include <gtk/gtk.h>
@@ -28,7 +28,7 @@ int main(int argc, char** argv) {
CommandLine::Init(argc, argv);
- gfx::GLContext::InitializeOneOff();
+ gfx::GLSurface::InitializeOneOff();
gpu::demos::Window window;
CHECK(window.Init(kWindowWidth, kWindowHeight));