summaryrefslogtreecommitdiffstats
path: root/webkit/support/webkit_support.cc
diff options
context:
space:
mode:
authorantonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-12 13:37:32 +0000
committerantonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-12 13:37:32 +0000
commit82642bb1c9402e67e46e0a48bdc075fd505fa36d (patch)
treecdbf1eea862acdbc63634ba23e3a8b921bbf72bf /webkit/support/webkit_support.cc
parentcc12116ee5640dcca9507900f259ed6d6ed4542b (diff)
downloadchromium_src-82642bb1c9402e67e46e0a48bdc075fd505fa36d.zip
chromium_src-82642bb1c9402e67e46e0a48bdc075fd505fa36d.tar.gz
chromium_src-82642bb1c9402e67e46e0a48bdc075fd505fa36d.tar.bz2
Revert "Reland 85013 - Split GLContext::Create*GLContext into GLSurface::Create*GLSurface plus a
surface type independent GLContext::CreateGLContext". git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/webkit_support.cc')
-rw-r--r--webkit/support/webkit_support.cc3
1 files changed, 1 insertions, 2 deletions
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);