diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 05:35:16 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 05:35:16 +0000 |
| commit | 89ac531b48d0fcad2702771935c471561062d2d9 (patch) | |
| tree | f4902d6029c74c9575bfb706f01f97eec9192180 /content/browser/plugin_process_host.cc | |
| parent | cf6863010ba3b8c1f106b08f62043ba8d44133a1 (diff) | |
| download | chromium_src-89ac531b48d0fcad2702771935c471561062d2d9.zip chromium_src-89ac531b48d0fcad2702771935c471561062d2d9.tar.gz chromium_src-89ac531b48d0fcad2702771935c471561062d2d9.tar.bz2 | |
Disable core animation plugins when compositing is unavailable.
When compositing is disabled or blacklisted we won't be able to composite core animation plugins, so disable them.
BUG=122430
TEST=flash works on nytimes.com with --disable-accelerated-compositing
TBR=kbr
Review URL: https://chromiumcodereview.appspot.com/10695027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_process_host.cc')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 7a976e0..f355012 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -23,6 +23,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_child_process_host_impl.h" +#include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/plugin_service_impl.h" #include "content/common/child_process_host_impl.h" #include "content/common/plugin_messages.h" @@ -220,6 +221,7 @@ bool PluginProcessHost::Init(const webkit::WebPluginInfo& info) { switches::kDisableBreakpad, #if defined(OS_MACOSX) switches::kDisableCompositedCoreAnimationPlugins, + switches::kDisableCoreAnimationPlugins, #endif switches::kDisableLogging, switches::kEnableDCHECK, @@ -240,6 +242,8 @@ bool PluginProcessHost::Init(const webkit::WebPluginInfo& info) { cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, arraysize(kSwitchNames)); + GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line); + // If specified, prepend a launcher program to the command line. if (!plugin_launcher.empty()) cmd_line->PrependWrapper(plugin_launcher); |