Added a command line flag that disables force-compositing-mode and modified the about:flags entry to provide a dropdown with three
options : "DEFAULT", "ENABLED", "DISABLED". This will be useful in conjunction with the FMC field trial as it will allow clients
who are in the FCM trial group to force FCM off.
BUG=114549
Review URL: https://chromiumcodereview.appspot.com/10546113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141862 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3663575..0e2c515 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -457,7 +457,8 @@
GpuProcessHost::gpu_enabled() &&
!command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
prefs.force_compositing_mode =
- command_line.HasSwitch(switches::kForceCompositingMode);
+ command_line.HasSwitch(switches::kForceCompositingMode) &&
+ !command_line.HasSwitch(switches::kDisableForceCompositingMode);
prefs.fixed_position_compositing_enabled =
command_line.HasSwitch(switches::kEnableCompositingForFixedPosition);
prefs.accelerated_2d_canvas_enabled =
