From 333c5c9ca65425d1796d9d13abda37ecbce2c9fb Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Wed, 11 May 2011 19:41:58 +0000 Subject: 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 --- webkit/support/webkit_support.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'webkit/support/webkit_support.cc') diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 8210aaa..520b988 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -36,7 +36,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/media/video_renderer_impl.h" #include "webkit/glue/webkit_constants.h" @@ -324,7 +323,7 @@ WebKit::WebString GetWebKitRootDir() { void SetUpGLBindings(GLBindingPreferences bindingPref) { switch(bindingPref) { case GL_BINDING_DEFAULT: - gfx::GLSurface::InitializeOneOff(); + gfx::GLContext::InitializeOneOff(); break; case GL_BINDING_SOFTWARE_RENDERER: gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); -- cgit v1.1