Use MSAA in GPU rasterization if Skia suggests it

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 354 matching lines @@
 const Experiment::Choice kNotificationCenterTrayBehaviorChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_NOTIFICATION_TRAY_BEHAVIOR_NEVER,
     message_center::switches::kNotificationCenterTrayBehavior, "never" },
   { IDS_FLAGS_NOTIFICATION_TRAY_BEHAVIOR_ALWAYS,
     message_center::switches::kNotificationCenterTrayBehavior, "always" },
   { IDS_FLAGS_NOTIFICATION_TRAY_BEHAVIOR_UNREAD,
     message_center::switches::kNotificationCenterTrayBehavior, "unread" }
 };
 
+const Experiment::Choice kEnableGPURasterizationChoices[] = {
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+    {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
+     cc::switches::kEnableGPURasterization, ""},
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+     cc::switches::kDisableGPURasterization, ""},
+    {IDS_FLAGS_ENABLE_GPU_RASTERIZATION_GPU,
+     cc::switches::kEnableGPURasterization, "gpu"},
+    {IDS_FLAGS_ENABLE_GPU_RASTERIZATION_MSAA4,
+     cc::switches::kEnableGPURasterization, "msaa4"},
+    {IDS_FLAGS_ENABLE_GPU_RASTERIZATION_MSAA16,
+     cc::switches::kEnableGPURasterization, "msaa16"}};
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
 // After doing that, run //tools/metrics/actions/extract_actions.py (see
 // instructions at the top of that file for details) to update the
 // chromeactions.txt file, which will enable UMA to record your feature flag.
@@ skipping 495 matching lines @@
 #else
     0,
 #endif
     SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)
   },
   {
     "enable-gpu-rasterization",
     IDS_FLAGS_ENABLE_GPU_RASTERIZATION_NAME,
     IDS_FLAGS_ENABLE_GPU_RASTERIZATION_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE(cc::switches::kEnableGPURasterization)
+    MULTI_VALUE_TYPE(kEnableGPURasterizationChoices)
   },
   {
     "enable-experimental-web-platform-features",
     IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME,
     IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures)
   },
   {
     "disable-ntp-other-sessions-menu",
@@ skipping 1540 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags