diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 05:21:09 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 05:21:09 +0000 |
| commit | 672c934384d168e8aafaf2b8c4207cb6d20e4fcd (patch) | |
| tree | 0fe5df01500cf86eb3e6e825d665d099b5fac7f7 /content/browser/plugin_process_host.cc | |
| parent | 4002002051b55045953017b4fb69015dd75fcf84 (diff) | |
| download | chromium_src-672c934384d168e8aafaf2b8c4207cb6d20e4fcd.zip chromium_src-672c934384d168e8aafaf2b8c4207cb6d20e4fcd.tar.gz chromium_src-672c934384d168e8aafaf2b8c4207cb6d20e4fcd.tar.bz2 | |
Revert 144578 - 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
Review URL: https://chromiumcodereview.appspot.com/10542112
TBR=jbauman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10698028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144665 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, 0 insertions, 4 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index f355012..7a976e0 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -23,7 +23,6 @@ #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" @@ -221,7 +220,6 @@ bool PluginProcessHost::Init(const webkit::WebPluginInfo& info) { switches::kDisableBreakpad, #if defined(OS_MACOSX) switches::kDisableCompositedCoreAnimationPlugins, - switches::kDisableCoreAnimationPlugins, #endif switches::kDisableLogging, switches::kEnableDCHECK, @@ -242,8 +240,6 @@ 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); |