Added a command line flag that disables force-compositing-mode and modified the about:flags entry t…

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 84 matching lines @@
 const Experiment::Choice kOmniboxInlineHistoryQuickProviderChoices[] = {
   { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_AUTOMATIC, "", "" },
   { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_ALLOWED,
     switches::kOmniboxInlineHistoryQuickProvider,
     switches::kOmniboxInlineHistoryQuickProviderAllowed },
   { IDS_FLAGS_OMNIBOX_INLINE_HISTORY_QUICK_PROVIDER_PROHIBITED,
     switches::kOmniboxInlineHistoryQuickProvider,
     switches::kOmniboxInlineHistoryQuickProviderProhibited }
 };
 
+const Experiment::Choice kForceCompositingModeChoices[] = {
+  { IDS_FLAGS_FORCE_COMPOSITING_MODE_DEFAULT, "", "" },
+  { IDS_FLAGS_FORCE_COMPOSITING_MODE_ENABLED,
+    switches::kForceCompositingMode, ""},
+  { IDS_FLAGS_FORCE_COMPOSITING_MODE_DISABLED,
+    switches::kDisableForceCompositingMode, ""}
+};
+
 const Experiment::Choice kThreadedCompositingModeChoices[] = {
   { IDS_FLAGS_THREADED_COMPOSITING_MODE_DEFAULT, "", "" },
   { IDS_FLAGS_THREADED_COMPOSITING_MODE_DISABLED,
     switches::kDisableThreadedCompositing, ""},
   { IDS_FLAGS_THREADED_COMPOSITING_MODE_ENABLED,
     switches::kEnableThreadedCompositing, ""}
 };
 
 const Experiment::Choice kTouchOptimizedUIChoices[] = {
   { IDS_FLAGS_TOUCH_OPTIMIZED_UI_AUTOMATIC, "", "" },
@@ skipping 84 matching lines @@
     "ignore-gpu-blacklist",
     IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME,
     IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)
   },
   {
     "force-compositing-mode-2",
     IDS_FLAGS_FORCE_COMPOSITING_MODE_NAME,
     IDS_FLAGS_FORCE_COMPOSITING_MODE_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kForceCompositingMode)
+    kOsMac | kOsWin | kOsLinux,
+    MULTI_VALUE_TYPE(kForceCompositingModeChoices)
   },
   {
     "threaded-compositing-mode",
     IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME,
     IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION,
     kOsAll,
     MULTI_VALUE_TYPE(kThreadedCompositingModeChoices)
   },
   {
     "disable-accelerated-2d-canvas",
@@ skipping 987 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags