Remove GPU_FEATURE_TYPE_3D_CSS and --disable-accelerated-layers

We ignore GPU_FEATURE_TYPE_3D_CSS, so remove it.
Nothing sets --disable-accelerated-layers, and it doesn't correspond to
a production path, so remove it.
This lets us clean up some WebPreferences fields which are always set to
true.

Also remove WebPreferences::accelerated_compositing_for_plugins_enabled
which is always true.

BUG=362164,365847
R=bbudge@chromium.org, danakj@chromium.org, tsepez@chromium.org

Review URL: https://codereview.chromium.org/239973005

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

16 files changed, 9 insertions, 72 deletions

diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index a9c3318..88e0d22 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -50,21 +50,6 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) {
           true
       },
       {
-          "3d_css",
-          manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_3D_CSS),
-          command_line.HasSwitch(switches::kDisableAcceleratedLayers),
-          "Accelerated layers have been disabled at the command line.",
-          false
-      },
-      {
-          "css_animation",
-          manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_3D_CSS),
-          command_line.HasSwitch(cc::switches::kDisableThreadedAnimation) ||
-          command_line.HasSwitch(switches::kDisableAcceleratedLayers),
-          "Accelerated CSS animation has been disabled at the command line.",
-          true
-      },
-      {
           "webgl",
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL),
           command_line.HasSwitch(switches::kDisableExperimentalWebGL),
@@ -254,9 +239,7 @@ base::Value* GetFeatureStatus() {
     std::string status;
     if (gpu_feature_info.disabled) {
       status = "disabled";
-      if (gpu_feature_info.name == "css_animation") {
-        status += "_software_animated";
-      } else if (gpu_feature_info.name == "raster") {
+      if (gpu_feature_info.name == "raster") {
         if (IsImplSidePaintingEnabled())
           status += "_software_multithreaded";
         else
@@ -281,12 +264,7 @@ base::Value* GetFeatureStatus() {
       if (gpu_feature_info.name == "webgl" &&
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
         status += "_readback";
-      if (gpu_feature_info.name == "css_animation") {
-        if (IsThreadedCompositingEnabled())
-          status = "accelerated_threaded";
-        else
-          status = "accelerated";
-      } else if (gpu_feature_info.name == "raster") {
+      if (gpu_feature_info.name == "raster") {
         if (IsForceGpuRasterizationEnabled())
           status += "_force";
       }
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 1428b9b..cf124a7 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -756,9 +756,6 @@ void GpuDataManagerImplPrivate::UpdateRendererWebPrefs(
           display_count_ > 1))
     prefs->gl_multisampling_enabled = false;
 
-  prefs->accelerated_compositing_for_3d_transforms_enabled = true;
-  prefs->accelerated_compositing_for_animation_enabled = true;
-  prefs->accelerated_compositing_for_plugins_enabled = true;
   prefs->accelerated_compositing_for_video_enabled = true;
 
 #if defined(USE_AURA)
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 2d11d5f..a8cf4ea 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -426,10 +426,6 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
       command_line.HasSwitch(switches::kEnableDeferredFilters);
   prefs.container_culling_enabled =
       command_line.HasSwitch(switches::kEnableContainerCulling);
-  prefs.accelerated_compositing_for_3d_transforms_enabled =
-      prefs.accelerated_compositing_for_animation_enabled =
-          !command_line.HasSwitch(switches::kDisableAcceleratedLayers);
-  prefs.accelerated_compositing_for_plugins_enabled = true;
   prefs.accelerated_compositing_for_video_enabled =
       !command_line.HasSwitch(switches::kDisableAcceleratedVideo);
   prefs.lazy_layout_enabled =
diff --git a/content/browser/resources/gpu/info_view.js b/content/browser/resources/gpu/info_view.js
index 74b13ab..28f0e8f 100644
--- a/content/browser/resources/gpu/info_view.js
+++ b/content/browser/resources/gpu/info_view.js
@@ -82,8 +82,6 @@ cr.define('gpu', function() {
       // Feature map
       var featureLabelMap = {
         '2d_canvas': 'Canvas',
-        '3d_css': '3D CSS',
-        'css_animation': 'CSS Animation',
         'gpu_compositing': 'Compositing',
         'webgl': 'WebGL',
         'multisampling': 'WebGL multisampling',
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h
index 78d0e62..cd8315b 100644
--- a/content/public/common/common_param_traits_macros.h
+++ b/content/public/common/common_param_traits_macros.h
@@ -151,9 +151,6 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(deferred_filters_enabled)
   IPC_STRUCT_TRAITS_MEMBER(container_culling_enabled)
   IPC_STRUCT_TRAITS_MEMBER(gesture_tap_highlight_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_plugins_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_3d_transforms_enabled)
-  IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_animation_enabled)
   IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_video_enabled)
   IPC_STRUCT_TRAITS_MEMBER(allow_displaying_insecure_content)
   IPC_STRUCT_TRAITS_MEMBER(allow_running_insecure_content)
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 4fd9c87..1bea2b1 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -81,9 +81,6 @@ const char kDisableAccelerated2dCanvas[]    = "disable-accelerated-2d-canvas";
 const char kDisableAcceleratedFixedRootBackground[] =
     "disable-accelerated-fixed-root-background";
 
-// Disables the hardware acceleration of 3D CSS and animation.
-const char kDisableAcceleratedLayers[]      = "disable-accelerated-layers";
-
 // Disables accelerated compositing for overflow scroll.
 const char kDisableAcceleratedOverflowScroll[] =
     "disable-accelerated-overflow-scroll";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 7161a50..63a021e 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -33,7 +33,6 @@ CONTENT_EXPORT extern const char kDisable2dCanvasAntialiasing[];
 CONTENT_EXPORT extern const char kDisable3DAPIs[];
 CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
 CONTENT_EXPORT extern const char kDisableAcceleratedFixedRootBackground[];
-CONTENT_EXPORT extern const char kDisableAcceleratedLayers[];
 CONTENT_EXPORT extern const char kDisableAcceleratedOverflowScroll[];
 CONTENT_EXPORT extern const char kDisableLayerSquashing[];
 CONTENT_EXPORT extern const char kDisableAcceleratedVideo[];
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc
index 8213bff..8a0859c 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -212,11 +212,6 @@ bool PPB_Graphics3D_Impl::InitRaw(PPB_Graphics3D_API* share_context,
   // 3D access might be disabled or blacklisted.
   if (!prefs.pepper_3d_enabled)
     return false;
-  // 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 (!prefs.accelerated_compositing_for_plugins_enabled)
-    return false;
 
   platform_context_.reset(new PlatformContext3D);
   if (!platform_context_)
diff --git a/content/renderer/web_preferences.cc b/content/renderer/web_preferences.cc
index 237d7dd..4a25b7e 100644
--- a/content/renderer/web_preferences.cc
+++ b/content/renderer/web_preferences.cc
@@ -231,17 +231,14 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
   settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled);
 
   // Enabling accelerated layers from the command line enabled accelerated
-  // 3D CSS, Video, and Animations.
-  settings->setAcceleratedCompositingFor3DTransformsEnabled(
-      prefs.accelerated_compositing_for_3d_transforms_enabled);
+  // Video.
   settings->setAcceleratedCompositingForVideoEnabled(
       prefs.accelerated_compositing_for_video_enabled);
-  settings->setAcceleratedCompositingForAnimationEnabled(
-      prefs.accelerated_compositing_for_animation_enabled);
 
-  // Enabling accelerated plugins if specified from the command line.
-  settings->setAcceleratedCompositingForPluginsEnabled(
-      prefs.accelerated_compositing_for_plugins_enabled);
+  // Always enable composited 3D css, animations and plugins.
+  settings->setAcceleratedCompositingFor3DTransformsEnabled(true);
+  settings->setAcceleratedCompositingForAnimationEnabled(true);
+  settings->setAcceleratedCompositingForPluginsEnabled(true);
 
   // WebGL and accelerated 2D canvas are always gpu composited.
   settings->setAcceleratedCompositingForCanvasEnabled(
diff --git a/content/test/gpu/gpu_tests/hardware_accelerated_feature.py b/content/test/gpu/gpu_tests/hardware_accelerated_feature.py
index 66e303f..f7c8e54 100644
--- a/content/test/gpu/gpu_tests/hardware_accelerated_feature.py
+++ b/content/test/gpu/gpu_tests/hardware_accelerated_feature.py
@@ -44,7 +44,7 @@ class HardwareAcceleratedFeature(test.Test):
     return expectations.HardwareAcceleratedFeatureExpectations()
 
   def CreatePageSet(self, options):
-    features = ['WebGL', 'Canvas', '3D CSS']
+    features = ['WebGL', 'Canvas']
 
     page_set_dict = {
       'description': 'Tests GPU acceleration is reported as active',
diff --git a/gpu/config/gpu_blacklist.cc b/gpu/config/gpu_blacklist.cc
index 8a67c63..932bec1 100644
--- a/gpu/config/gpu_blacklist.cc
+++ b/gpu/config/gpu_blacklist.cc
@@ -34,8 +34,6 @@ GpuBlacklist* GpuBlacklist::Create() {
                             GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE);
   list->AddSupportedFeature("accelerated_video_encode",
                             GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE);
-  list->AddSupportedFeature("3d_css",
-                            GPU_FEATURE_TYPE_3D_CSS);
   list->AddSupportedFeature("accelerated_video",
                             GPU_FEATURE_TYPE_ACCELERATED_VIDEO);
   list->AddSupportedFeature("panel_fitting",
diff --git a/gpu/config/gpu_blacklist_unittest.cc b/gpu/config/gpu_blacklist_unittest.cc
index 539f2e6..26a5b2a 100644
--- a/gpu/config/gpu_blacklist_unittest.cc
+++ b/gpu/config/gpu_blacklist_unittest.cc
@@ -120,10 +120,6 @@ GPU_BLACKLIST_FEATURE_TEST(AcceleratedVideoEncode,
                            "accelerated_video_encode",
                            GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE)
 
-GPU_BLACKLIST_FEATURE_TEST(Css3D,
-                           "3d_css",
-                           GPU_FEATURE_TYPE_3D_CSS)
-
 GPU_BLACKLIST_FEATURE_TEST(AcceleratedVideo,
                            "accelerated_video",
                            GPU_FEATURE_TYPE_ACCELERATED_VIDEO)
diff --git a/gpu/config/gpu_feature_type.h b/gpu/config/gpu_feature_type.h
index f023ecb..2574f857 100644
--- a/gpu/config/gpu_feature_type.h
+++ b/gpu/config/gpu_feature_type.h
@@ -18,7 +18,6 @@ enum GpuFeatureType {
   GPU_FEATURE_TYPE_FLASH_STAGE3D,
   GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE,
   GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE,
-  GPU_FEATURE_TYPE_3D_CSS,
   GPU_FEATURE_TYPE_ACCELERATED_VIDEO,
   GPU_FEATURE_TYPE_PANEL_FITTING,
   GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE,
diff --git a/ppapi/shared_impl/ppapi_preferences.cc b/ppapi/shared_impl/ppapi_preferences.cc
index 79d8d27..662c8eb 100644
--- a/ppapi/shared_impl/ppapi_preferences.cc
+++ b/ppapi/shared_impl/ppapi_preferences.cc
@@ -26,11 +26,7 @@ Preferences::Preferences(const WebPreferences& prefs)
       is_3d_supported(prefs.flash_3d_enabled),
       is_stage3d_supported(prefs.flash_stage3d_enabled),
       is_stage3d_baseline_supported(prefs.flash_stage3d_baseline_enabled),
-      // This determines both if webgl is supported (experimental_webgl_enabled)
-      // and if it runs in hardware
-      // (accelerated_compositing_for_plugins_enabled)
-      is_webgl_supported(prefs.experimental_webgl_enabled &&
-                         prefs.accelerated_compositing_for_plugins_enabled),
+      is_webgl_supported(prefs.experimental_webgl_enabled),
       is_accelerated_video_decode_enabled(
           prefs.pepper_accelerated_video_decode_enabled) {}
 
diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc
index d917d7e..cc3ea5e 100644
--- a/webkit/common/webpreferences.cc
+++ b/webkit/common/webpreferences.cc
@@ -62,8 +62,6 @@ WebPreferences::WebPreferences()
       asynchronous_spell_checking_enabled(true),
       unified_textchecker_enabled(false),
       force_compositing_mode(true),
-      accelerated_compositing_for_3d_transforms_enabled(false),
-      accelerated_compositing_for_animation_enabled(false),
       accelerated_compositing_for_video_enabled(false),
       accelerated_2d_canvas_enabled(false),
       minimum_accelerated_2d_canvas_size(257 * 256),
@@ -73,7 +71,6 @@ WebPreferences::WebPreferences()
       deferred_filters_enabled(false),
       container_culling_enabled(false),
       gesture_tap_highlight_enabled(false),
-      accelerated_compositing_for_plugins_enabled(false),
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
       password_echo_enabled(false),
diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h
index 0e678e9..fe8abdc 100644
--- a/webkit/common/webpreferences.h
+++ b/webkit/common/webpreferences.h
@@ -110,8 +110,6 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
   bool asynchronous_spell_checking_enabled;
   bool unified_textchecker_enabled;
   bool force_compositing_mode;
-  bool accelerated_compositing_for_3d_transforms_enabled;
-  bool accelerated_compositing_for_animation_enabled;
   bool accelerated_compositing_for_video_enabled;
   bool accelerated_2d_canvas_enabled;
   int minimum_accelerated_2d_canvas_size;
@@ -121,7 +119,6 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
   bool deferred_filters_enabled;
   bool container_culling_enabled;
   bool gesture_tap_highlight_enabled;
-  bool accelerated_compositing_for_plugins_enabled;
   bool allow_displaying_insecure_content;
   bool allow_running_insecure_content;
   bool password_echo_enabled;