cc: Trigger GPU rasterization based on a per-layer hint

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f11a2c4e7db93665bbb9207f5aaa53e620109901..c395c93f104b65a5c14537e99c3ae75b310d8e97 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -199,15 +199,15 @@ const Experiment::Choice kNaClDebugMaskChoices[] = {
 const Experiment::Choice kImplSidePaintingChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    cc::switches::kEnableImplSidePainting, ""},
+    switches::kEnableImplSidePainting, ""},
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    cc::switches::kDisableImplSidePainting, ""}
+    switches::kDisableImplSidePainting, ""}
 };
 
 const Experiment::Choice kLCDTextChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, cc::switches::kEnableLCDText, ""},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, cc::switches::kDisableLCDText, ""}
+  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, switches::kEnableLCDText, ""},
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kDisableLCDText, ""}
 };
 
 const Experiment::Choice kDelegatedRendererChoices[] = {
@@ -297,9 +297,9 @@ const Experiment::Choice kOverlayScrollbarChoices[] = {
 const Experiment::Choice kMapImageChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    cc::switches::kEnableMapImage, ""},
+    switches::kEnableMapImage, ""},
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    cc::switches::kDisableMapImage, ""}
+    switches::kDisableMapImage, ""}
 };
 
 #if defined(OS_ANDROID)
@@ -324,6 +324,16 @@ const Experiment::Choice kNumRasterThreadsChoices[] = {
   { IDS_FLAGS_NUM_RASTER_THREADS_FOUR, switches::kNumRasterThreads, "4" }
 };
 
+const Experiment::Choice kRasterizationSiteChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_FLAGS_CPU_RASTERIZATION,
+    switches::kRasterizationSite, "cpu" },
+  { IDS_FLAGS_HYBRID_RASTERIZATION,
+    switches::kRasterizationSite, "hybrid" },
+  { IDS_FLAGS_GPU_RASTERIZATION,
+    switches::kRasterizationSite, "gpu" },
+};
+
 // We're using independent flags here (as opposed to a common flag with
 // different values) to be able to enable/disable the entire experience
 // associated with this feature server-side from the FieldTrial (the complete
@@ -876,11 +886,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)
   },
   {
-    "enable-gpu-rasterization",
-    IDS_FLAGS_ENABLE_GPU_RASTERIZATION_NAME,
-    IDS_FLAGS_ENABLE_GPU_RASTERIZATION_DESCRIPTION,
+    "rasterization-site",
+    IDS_FLAGS_RASTERIZATION_SITE_NAME,
+    IDS_FLAGS_RASTERIZATION_SITE_DESCRIPTION,
     kOsAndroid,
-    SINGLE_VALUE_TYPE(cc::switches::kEnableGPURasterization)
+    MULTI_VALUE_TYPE(kRasterizationSiteChoices)
   },
   {
     "enable-experimental-web-platform-features",