diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 19:22:37 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 19:22:37 +0000 |
commit | 92c2bc5ac0f605a14dfa88649e7c5a844eb0922b (patch) | |
tree | 814efb2ec279b176a052713fba9ae8d000265116 /content/gpu/gpu_child_thread.cc | |
parent | b6793a8d2f4af8c0ca6cfca6fbe3168f5de75b5e (diff) | |
download | chromium_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 'content/gpu/gpu_child_thread.cc')
-rw-r--r-- | content/gpu/gpu_child_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index c9a5acd..8612a66 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -18,8 +18,8 @@ #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" #include "ipc/ipc_channel_handle.h" -#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_surface.h" #if defined(OS_MACOSX) #include "content/common/sandbox_init_wrapper.h" @@ -121,7 +121,7 @@ void GpuChildThread::OnInitialize() { // Load the GL implementation and locate the bindings before starting the GPU // watchdog because this can take a lot of time and the GPU watchdog might // terminate the GPU process. - if (!gfx::GLContext::InitializeOneOff()) { + if (!gfx::GLSurface::InitializeOneOff()) { LOG(INFO) << "GLContext::InitializeOneOff failed"; MessageLoop::current()->Quit(); return; |