Add --disable-slimming-paint-invalidation

This can be used to disable SlimmingPaintInvalidation when it is enabled
by default.

BUG=646176
TBR=achuith@chromium.org (for chrome/browser/chromeos/login/chrome_restart_request.cc)
R=pdr@chromium.org,creis@chromium.org,holte@chromium.org

Review-Url: https://codereview.chromium.org/2612323002
Cr-Commit-Position: refs/heads/master@{#441959}

chrome/app/generated_resources.grd

@@ -6044,11 +6044,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_SIXTEEN" desc="">
         16
       </message>
-      <message name="IDS_FLAGS_ENABLE_SLIMMING_PAINT_INVALIDATION_NAME" desc="Title for about:flags option to enable slimming paint invalidation.">
+      <message name="IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_NAME" desc="Title for about:flags option for slimming paint invalidation.">
         Slimming paint invalidation.
       </message>
-      <message name="IDS_FLAGS_ENABLE_SLIMMING_PAINT_INVALIDATION_DESCRIPTION" desc="Description of about:flags option for enabling slimming paint invalidation.">
-        Enable a new paint invalidation system.
+      <message name="IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_DESCRIPTION" desc="Description of about:flags option for slimming paint invalidation.">
+        Whether to enable a new paint invalidation system.
       </message>
       <message name="IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME" desc="Name for the flag to enable experimental security features.">
         Potentially annoying security features

chrome/browser/about_flags.cc

@@ -869,10 +869,11 @@ const FeatureEntry kFeatureEntries[] = {
      IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME,
      IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll,
      MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)},
-    {"enable-slimming-paint-invalidation",
-     IDS_FLAGS_ENABLE_SLIMMING_PAINT_INVALIDATION_NAME,
-     IDS_FLAGS_ENABLE_SLIMMING_PAINT_INVALIDATION_DESCRIPTION, kOsAll,
-     SINGLE_VALUE_TYPE(switches::kEnableSlimmingPaintInvalidation)},
+    {"slimming-paint-invalidation",
+     IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_NAME,
+     IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_DESCRIPTION, kOsAll,
+     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSlimmingPaintInvalidation,
+                               switches::kDisableSlimmingPaintInvalidation)},
     {"enable-experimental-web-platform-features",
      IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME,
      IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, kOsAll,

chrome/browser/chromeos/login/chrome_restart_request.cc

@@ -99,6 +99,7 @@ void DeriveCommandLine(const GURL& start_url,
     ::switches::kDisableRGBA4444Textures,
     ::switches::kDisableSeccompFilterSandbox,
     ::switches::kDisableSetuidSandbox,
+    ::switches::kDisableSlimmingPaintInvalidation,
     ::switches::kDisableThreadedScrolling,
     ::switches::kDisableTouchDragDrop,
     ::switches::kDisableZeroCopy,

content/browser/renderer_host/render_process_host_impl.cc

@@ -1704,6 +1704,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kDisableRTCSmoothnessAlgorithm,
     switches::kDisableSeccompFilterSandbox,
     switches::kDisableSharedWorkers,
+    switches::kDisableSlimmingPaintInvalidation,
     switches::kDisableSmoothScrolling,
     switches::kDisableSpeechAPI,
     switches::kDisableThreadedCompositing,

content/child/runtime_features.cc

@@ -256,6 +256,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   if (command_line.HasSwitch(switches::kEnableSlimmingPaintInvalidation))
     WebRuntimeFeatures::enableSlimmingPaintInvalidation(true);
 
+  if (command_line.HasSwitch(switches::kDisableSlimmingPaintInvalidation))
+    WebRuntimeFeatures::enableSlimmingPaintInvalidation(false);
+
   if (base::FeatureList::IsEnabled(features::kDocumentWriteEvaluator))
     WebRuntimeFeatures::enableDocumentWriteEvaluator(true);
 

content/public/common/content_switches.cc

@@ -283,6 +283,11 @@ const char kDisableSetuidSandbox[]          = "disable-setuid-sandbox";
 // Disable shared workers.
 const char kDisableSharedWorkers[]          = "disable-shared-workers";
 
+// Disable paint invalidation based on slimming paint.
+// See kEnableSlimmingPaintInvalidation.
+const char kDisableSlimmingPaintInvalidation[] =
+    "disable-slimming-paint-invalidation";
+
 // Disable smooth scrolling for testing.
 const char kDisableSmoothScrolling[]        = "disable-smooth-scrolling";
 
@@ -464,8 +469,8 @@ const char kEnableSkiaBenchmarking[]        = "enable-skia-benchmarking";
 // Enables slimming paint phase 2: http://www.chromium.org/blink/slimming-paint
 const char kEnableSlimmingPaintV2[]         = "enable-slimming-paint-v2";
 
-// Enables paint invalidation based on slimming paint but without the full
-// slimming paint v2 compositing code. See: https://goo.gl/eQczQW
+// Enables paint invalidation based on slimming paint but without
+// the full slimming paint v2 compositing code. See: https://goo.gl/eQczQW
 const char kEnableSlimmingPaintInvalidation[] =
     "enable-slimming-paint-invalidation";
 

content/public/common/content_switches.h

@@ -94,6 +94,7 @@ CONTENT_EXPORT extern const char kDisableResizeLock[];
 CONTENT_EXPORT extern const char kDisableSeccompFilterSandbox[];
 CONTENT_EXPORT extern const char kDisableSetuidSandbox[];
 CONTENT_EXPORT extern const char kDisableSharedWorkers[];
+CONTENT_EXPORT extern const char kDisableSlimmingPaintInvalidation[];
 CONTENT_EXPORT extern const char kDisableSmoothScrolling[];
 CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[];
 CONTENT_EXPORT extern const char kDisableSpeechAPI[];

tools/metrics/histograms/histograms.xml

@@ -94419,6 +94419,7 @@ value.
   <int value="1022992701" label="enable-origin-chip-always"/>
   <int value="1033597574" label="disable-layer-squashing"/>
   <int value="1036068554" label="enable-android-pay-integration-v2"/>
+  <int value="1043334401" label="disable-slimming-paint-invalidation"/>
   <int value="1050048304" label="enable-font-cache-scaling"/>
   <int value="1050321458" label="new-profile-management"/>
   <int value="1054910800" label="enable-timezone-tracking-option"/>