diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:39:36 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:39:36 +0000 |
| commit | e73e0fe57fdc98d7d963c9aaf243e0b24afe67c3 (patch) | |
| tree | f56246c3d1bb5941f5293ae0600f3f75db4641b0 /chrome/renderer/pepper_plugin_delegate_impl.cc | |
| parent | d8ef52652970f285d2c592276be6111be1e9cf3b (diff) | |
| download | chromium_src-e73e0fe57fdc98d7d963c9aaf243e0b24afe67c3.zip chromium_src-e73e0fe57fdc98d7d963c9aaf243e0b24afe67c3.tar.gz chromium_src-e73e0fe57fdc98d7d963c9aaf243e0b24afe67c3.tar.bz2 | |
Disable Pepper 3d contexts when accelerated compositing of plugins is disabled
BUG=none
TEST=Pepper Flash
Review URL: http://codereview.chromium.org/6127007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/pepper_plugin_delegate_impl.cc')
| -rw-r--r-- | chrome/renderer/pepper_plugin_delegate_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc index eba798a..bdbee23 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.cc +++ b/chrome/renderer/pepper_plugin_delegate_impl.cc @@ -515,6 +515,11 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int height) { webkit::ppapi::PluginDelegate::PlatformContext3D* PepperPluginDelegateImpl::CreateContext3D() { #ifdef ENABLE_GPU + // If accelerated compositing of plugins is disabled, fail to create a 3D + // context, because it won't be visible. This allows graceful fallback in the + // modules. + if (!render_view_->webkit_preferences().accelerated_plugins_enabled) + return NULL; WebGraphicsContext3DCommandBufferImpl* context = static_cast<WebGraphicsContext3DCommandBufferImpl*>( render_view_->webview()->graphicsContext3D()); |