Add --enable-accelerated-plugins flag to enable compositing for plugins, separately from the rest.

The PPAPI 3D implementation requires accelerated compositing to be on. For both NaCl and Pepper Flash, we want to be able to enable compositing for plugins, without forcing it on for everything else.

BUG=None
TEST=with pepper flash

Review URL: http://codereview.chromium.org/6190005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70964 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 02092de..a802350 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -66,6 +66,7 @@ WebPreferences::WebPreferences()
       accelerated_layers_enabled(false),
       accelerated_video_enabled(false),
       accelerated_2d_canvas_enabled(false),
+      accelerated_plugins_enabled(false),
       memory_info_enabled(false) {
 }
 
@@ -157,16 +158,18 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled);
 
   // Enabling accelerated layers from the command line enabled accelerated
-  // 3D CSS, Video, Plugins, and Animations.
+  // 3D CSS, Video, and Animations.
   settings->setAcceleratedCompositingFor3DTransformsEnabled(
       accelerated_layers_enabled);
   settings->setAcceleratedCompositingForVideoEnabled(
       accelerated_video_enabled);
-  settings->setAcceleratedCompositingForPluginsEnabled(
-      accelerated_layers_enabled);
   settings->setAcceleratedCompositingForAnimationEnabled(
       accelerated_layers_enabled);
 
+  // Enabling accelerated plugins if specified from the command line.
+  settings->setAcceleratedCompositingForPluginsEnabled(
+      accelerated_plugins_enabled);
+
   // WebGL and accelerated 2D canvas are always gpu composited.
   settings->setAcceleratedCompositingForCanvasEnabled(
       enable_webgl || accelerated_2d_canvas_enabled);