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

3 files changed, 3 insertions, 30 deletions

diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index 3c49377..53f91e9 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -19,7 +19,6 @@
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 #include "webkit/plugins/plugin_switches.h"
@@ -238,24 +237,6 @@ void GpuDataManagerImpl::AppendGpuCommandLine(
   }
 }
 
-void GpuDataManagerImpl::AppendPluginCommandLine(
-    CommandLine* command_line) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(command_line);
-
-#if defined(OS_MACOSX)
-  uint32 flags = GetGpuFeatureType();
-  if ((flags & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableAcceleratedCompositing)) {
-    if (!command_line->HasSwitch(
-           switches::kDisableCompositedCoreAnimationPlugins))
-      command_line->AppendSwitch(
-          switches::kDisableCompositedCoreAnimationPlugins);
-  }
-#endif
-}
-
 void GpuDataManagerImpl::SetGpuFeatureType(GpuFeatureType feature_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UpdateGpuFeatureType(feature_type);
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
index 7683373..3c665d1 100644
--- a/content/browser/gpu/gpu_data_manager_impl.h
+++ b/content/browser/gpu/gpu_data_manager_impl.h
@@ -46,18 +46,14 @@ class CONTENT_EXPORT GpuDataManagerImpl
 
   void AddLogMessage(Value* msg);
 
-  // Insert disable-feature switches corresponding to preliminary gpu feature
-  // flags into the renderer process command line.
+  // Inserting disable-feature switches into renderer process command-line
+  // in correspondence to preliminary gpu feature flags.
   void AppendRendererCommandLine(CommandLine* command_line);
 
-  // Insert switches into gpu process command line: kUseGL,
+  // Inserting switches into gpu process command-line: kUseGL,
   // kDisableGLMultisampling.
   void AppendGpuCommandLine(CommandLine* command_line);
 
-  // Insert switches into plugin process command line:
-  // kDisableCoreAnimationPlugins.
-  void AppendPluginCommandLine(CommandLine* command_line);
-
   // This gets called when switching GPU might have happened.
   void HandleGpuSwitch();
 
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);