diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 00:23:12 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 00:23:12 +0000 |
| commit | 0f7e26850214927faeb097db30555498e8232d9e (patch) | |
| tree | 9dadabc392615a71c88061b4077933c27157abf6 | |
| parent | 9e87c02ecbde5bfb2200a6b7ec7b73765f76c47e (diff) | |
| download | chromium_src-0f7e26850214927faeb097db30555498e8232d9e.zip chromium_src-0f7e26850214927faeb097db30555498e8232d9e.tar.gz chromium_src-0f7e26850214927faeb097db30555498e8232d9e.tar.bz2 | |
Remove --disable-3d-apis check for pepper interfaces in the renderer.
The flag should only affect NaCl binaries, so this is the wrong place to check. We'll re-introduce a check inside the NaCl plugin to get the desired behavior.
BUG=chromium-os:16667
TEST=configure Disable3DAPIs and observer renderer on chromeos is not crashing upon instantiating flash plugins.
Review URL: http://codereview.chromium.org/7459004
git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@93136 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index 0f16cc1..14b543b 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -343,23 +343,20 @@ const void* GetInterface(const char* name) { return PluginInstance::GetZoomInterface(); #ifdef ENABLE_GPU - // This should really refer to switches::kDisable3DAPIs. - if (!CommandLine::ForCurrentProcess()->HasSwitch("disable-3d-apis")) { - if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0) - return PPB_Graphics3D_Impl::GetInterface(); - if (strcmp(name, PPB_CONTEXT_3D_DEV_INTERFACE) == 0) - return PPB_Context3D_Impl::GetInterface(); - if (strcmp(name, PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE) == 0) - return PPB_Context3D_Impl::GetTrustedInterface(); - if (strcmp(name, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE) == 0) - return PPB_GLESChromiumTextureMapping_Impl::GetInterface(); - if (strcmp(name, PPB_OPENGLES2_DEV_INTERFACE) == 0) - return PPB_OpenGLES_Impl::GetInterface(); - if (strcmp(name, PPB_SURFACE_3D_DEV_INTERFACE) == 0) - return PPB_Surface3D_Impl::GetInterface(); - if (strcmp(name, PPB_LAYER_COMPOSITOR_DEV_INTERFACE) == 0) - return PPB_LayerCompositor_Impl::GetInterface(); - } + if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0) + return PPB_Graphics3D_Impl::GetInterface(); + if (strcmp(name, PPB_CONTEXT_3D_DEV_INTERFACE) == 0) + return PPB_Context3D_Impl::GetInterface(); + if (strcmp(name, PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE) == 0) + return PPB_Context3D_Impl::GetTrustedInterface(); + if (strcmp(name, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE) == 0) + return PPB_GLESChromiumTextureMapping_Impl::GetInterface(); + if (strcmp(name, PPB_OPENGLES2_DEV_INTERFACE) == 0) + return PPB_OpenGLES_Impl::GetInterface(); + if (strcmp(name, PPB_SURFACE_3D_DEV_INTERFACE) == 0) + return PPB_Surface3D_Impl::GetInterface(); + if (strcmp(name, PPB_LAYER_COMPOSITOR_DEV_INTERFACE) == 0) + return PPB_LayerCompositor_Impl::GetInterface(); #endif // ENABLE_GPU #ifdef ENABLE_FLAPPER_HACKS |