diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 22:54:29 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 22:54:29 +0000 |
| commit | ffae402c58ea5e0787208ccdcd60b0f021b7ebd2 (patch) | |
| tree | 0fdcbd1873b6a76b47d3074976a8e9f07b9d68ed /webkit/support | |
| parent | 8d9591d65ffcd08c5f69f5bb231f9c08a1f7042a (diff) | |
| download | chromium_src-ffae402c58ea5e0787208ccdcd60b0f021b7ebd2.zip chromium_src-ffae402c58ea5e0787208ccdcd60b0f021b7ebd2.tar.gz chromium_src-ffae402c58ea5e0787208ccdcd60b0f021b7ebd2.tar.bz2 | |
Reland 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a
surface type independent GLContext::CreateGLContext
TEST=try, including layout tests
BUG=none
Review URL: http://codereview.chromium.org/7013037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 520b988..8210aaa 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -36,6 +36,7 @@ #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" @@ -323,7 +324,7 @@ WebKit::WebString GetWebKitRootDir() { void SetUpGLBindings(GLBindingPreferences bindingPref) { switch(bindingPref) { case GL_BINDING_DEFAULT: - gfx::GLContext::InitializeOneOff(); + gfx::GLSurface::InitializeOneOff(); break; case GL_BINDING_SOFTWARE_RENDERER: gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); |