Remove GPU_FEATURE_TYPE_3D_CSS and --disable-accelerated-layers

content/browser/gpu/compositor_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
@@ skipping 32 matching lines @@
       {
           "gpu_compositing",
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING),
           false,
           "Gpu compositing has been disabled, either via about:flags or"
           " command line. The browser will fall back to software compositing"
           " and hardware acceleration will be unavailable.",
           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),
           "WebGL has been disabled, either via about:flags or command line.",
           false
       },
       {
           "flash_3d",
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_FLASH3D),
           command_line.HasSwitch(switches::kDisableFlash3d),
@@ skipping 169 matching lines @@
       !manager->GpuAccessAllowed(&gpu_access_blocked_reason);
 
   base::DictionaryValue* feature_status_dict = new base::DictionaryValue();
 
   bool eof = false;
   for (size_t i = 0; !eof; ++i) {
     const GpuFeatureInfo gpu_feature_info = GetGpuFeatureInfo(i, &eof);
     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
           status += "_software";
       } else {
         if (gpu_feature_info.fallback_to_software)
           status += "_software";
         else
           status += "_off";
       }
     } else if (manager->ShouldUseSwiftShader()) {
       status = "unavailable_software";
     } else if (gpu_feature_info.blocked ||
                gpu_access_blocked) {
       status = "unavailable";
       if (gpu_feature_info.fallback_to_software)
         status += "_software";
       else
         status += "_off";
     } else {
       status = "enabled";
       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";
       }
     }
     if (gpu_feature_info.name == "gpu_compositing") {
       if (IsThreadedCompositingEnabled())
         status += "_threaded";
     }
     feature_status_dict->SetString(
         gpu_feature_info.name.c_str(), status.c_str());
@@ skipping 42 matching lines @@
   return problem_list;
 }
 
 base::Value* GetDriverBugWorkarounds() {
   base::ListValue* workaround_list = new base::ListValue();
   GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list);
   return workaround_list;
 }
 
 }  // namespace content