Remove non-impl-side painting as an option for blink.

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 "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 11 matching lines @@
 
 static bool IsGpuRasterizationBlacklisted() {
   GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance();
   return manager->IsFeatureBlacklisted(
         gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION);
 }
 
 const char* kGpuCompositingFeatureName = "gpu_compositing";
 const char* kWebGLFeatureName = "webgl";
 const char* kRasterizationFeatureName = "rasterization";
-const char* kThreadedRasterizationFeatureName = "threaded_rasterization";
 const char* kMultipleRasterThreadsFeatureName = "multiple_raster_threads";
 
 const int kMinRasterThreads = 1;
 const int kMaxRasterThreads = 16;
 
 const int kMinMSAASampleCount = 0;
 
 struct GpuFeatureInfo {
   std::string name;
   bool blocked;
@@ skipping 95 matching lines @@
           kRasterizationFeatureName,
           IsGpuRasterizationBlacklisted() &&
           !IsGpuRasterizationEnabled() && !IsForceGpuRasterizationEnabled(),
           !IsGpuRasterizationEnabled() && !IsForceGpuRasterizationEnabled() &&
           !IsGpuRasterizationBlacklisted(),
           "Accelerated rasterization has been disabled, either via about:flags"
           " or command line.",
           true
       },
       {
-          kThreadedRasterizationFeatureName,
-          false,
-          !IsImplSidePaintingEnabled(),
-          "Threaded rasterization has not been enabled or"
-          " is not supported by the current system.",
-          false
-      },
-      {
           kMultipleRasterThreadsFeatureName,
           false,
           NumberOfRendererRasterThreads() == 1,
           "Raster is using a single thread.",
           false
       },
   };
   DCHECK(index < arraysize(kGpuFeatureInfo));
   *eof = (index == arraysize(kGpuFeatureInfo) - 1);
   return kGpuFeatureInfo[index];
@@ skipping 16 matching lines @@
   // Enable on Aura and Mac.
   enabled = true;
 #endif
 
   // Flags override.
   enabled |= command_line.HasSwitch(switches::kEnableDelegatedRenderer);
   enabled &= !command_line.HasSwitch(switches::kDisableDelegatedRenderer);
   return enabled;
 }
 
-bool IsImplSidePaintingEnabled() {
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kDisableImplSidePainting))
-    return false;
-  return true;
-}
-
 int NumberOfRendererRasterThreads() {
   int num_processors = base::SysInfo::NumberOfProcessors();
 
 #if defined(OS_ANDROID)
   // Android may report 6 to 8 CPUs for big.LITTLE configurations.
   // Limit the number of raster threads based on maximum of 4 big cores.
   num_processors = std::min(num_processors, 4);
 #endif
 
   int num_raster_threads = num_processors / 2;
@@ skipping 50 matching lines @@
   // TODO(reveman): One-copy can work with sync compositing: crbug.com/490295.
   if (command_line.HasSwitch(switches::kDisableThreadedCompositing))
     return true;
   return command_line.HasSwitch(switches::kEnableZeroCopy);
 }
 
 bool IsGpuRasterizationEnabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
-  if (!IsImplSidePaintingEnabled())
-    return false;
-
   if (command_line.HasSwitch(switches::kDisableGpuRasterization))
     return false;
   else if (command_line.HasSwitch(switches::kEnableGpuRasterization))
     return true;
 
   if (IsGpuRasterizationBlacklisted()) {
     return false;
   }
 
 #if defined(OS_ANDROID)
   return true;
 #endif
 
   // explicitly disable GPU rasterization on all non-android devices until we
   // have full test coverage.
   return false;
 }
 
 bool IsForceGpuRasterizationEnabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-
-  if (!IsImplSidePaintingEnabled())
-    return false;
-
   return command_line.HasSwitch(switches::kForceGpuRasterization);
 }
 
 bool UseSurfacesEnabled() {
 #if defined(OS_ANDROID)
   return false;
 #endif
   bool enabled = false;
 #if defined(USE_AURA) || defined(OS_MACOSX)
   enabled = true;
@@ skipping 43 matching lines @@
   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.fallback_to_software)
         status += "_software";
       else
         status += "_off";
-      if (gpu_feature_info.name == kThreadedRasterizationFeatureName)
-        status += "_ok";
     } 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 == kWebGLFeatureName &&
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
         status += "_readback";
       if (gpu_feature_info.name == kRasterizationFeatureName) {
         if (IsForceGpuRasterizationEnabled())
           status += "_force";
       }
       if (gpu_feature_info.name == kMultipleRasterThreadsFeatureName) {
         const base::CommandLine& command_line =
             *base::CommandLine::ForCurrentProcess();
         if (command_line.HasSwitch(switches::kNumRasterThreads))
           status += "_force";
       }
-      if (gpu_feature_info.name == kThreadedRasterizationFeatureName ||
-          gpu_feature_info.name == kMultipleRasterThreadsFeatureName)
+      if (gpu_feature_info.name == kMultipleRasterThreadsFeatureName)
         status += "_on";
     }
     if (gpu_feature_info.name == kWebGLFeatureName &&
         (gpu_feature_info.blocked || gpu_access_blocked) &&
         manager->ShouldUseSwiftShader()) {
       status = "unavailable_software";
     }
 
     feature_status_dict->SetString(
         gpu_feature_info.name.c_str(), status.c_str());
@@ skipping 40 matching lines @@
     }
   }
   return problem_list;
 }
 
 std::vector<std::string> GetDriverBugWorkarounds() {
   return GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds();
 }
 
 }  // namespace content