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

content/browser/gpu/compositor_util.cc

Index: content/browser/gpu/compositor_util.cc
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index 635944fba1422c0de5b4a8f7b6fd4f702ab661f6..82968b32a64a336be359ccbcb93defe19e152a4e 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -29,7 +29,6 @@ static bool IsGpuRasterizationBlacklisted() {
 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;
@@ -145,14 +144,6 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) {
           true
       },
       {
-          kThreadedRasterizationFeatureName,
-          false,
-          !IsImplSidePaintingEnabled(),
-          "Threaded rasterization has not been enabled or"
-          " is not supported by the current system.",
-          false
-      },
-      {
           kMultipleRasterThreadsFeatureName,
           false,
           NumberOfRendererRasterThreads() == 1,
@@ -189,14 +180,6 @@ bool IsDelegatedRendererEnabled() {
   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();
 
@@ -267,9 +250,6 @@ 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))
@@ -291,10 +271,6 @@ bool IsGpuRasterizationEnabled() {
 bool IsForceGpuRasterizationEnabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-
-  if (!IsImplSidePaintingEnabled())
-    return false;
-
   return command_line.HasSwitch(switches::kForceGpuRasterization);
 }
 
@@ -358,8 +334,6 @@ base::DictionaryValue* GetFeatureStatus() {
         status += "_software";
       else
         status += "_off";
-      if (gpu_feature_info.name == kThreadedRasterizationFeatureName)
-        status += "_ok";
     } else if (gpu_feature_info.blocked ||
                gpu_access_blocked) {
       status = "unavailable";
@@ -382,8 +356,7 @@ base::DictionaryValue* GetFeatureStatus() {
         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 &&