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 /webkit/plugins/npapi/plugin_host.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 'webkit/plugins/npapi/plugin_host.cc')
| -rw-r--r-- | webkit/plugins/npapi/plugin_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index b6021d46..e92c22e 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -17,8 +17,8 @@ #include "third_party/npapi/bindings/npruntime.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_surface.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/default_plugin_shared.h" #include "webkit/plugins/npapi/npapi_extension_thunk.h" @@ -62,7 +62,7 @@ static bool SupportsSharingAcceleratedSurfaces() { gfx::GLImplementation implementation = gfx::GetGLImplementation(); if (implementation == gfx::kGLImplementationNone) { // Not initialized yet. - if (!gfx::GLContext::InitializeOneOff()) { + if (!gfx::GLSurface::InitializeOneOff()) { return false; } implementation = gfx::GetGLImplementation(); |