| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index ad0e6cd7c64506f591b6d7a8e5b82aa488f3a795..5fc3c2bb65c104450ce23a107bc060a4bee8422f 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -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,
|
| + cc::switches::kRasterizationSite, "cpu" },
|
| + { IDS_FLAGS_HYBRID_RASTERIZATION,
|
| + cc::switches::kRasterizationSite, "hybrid" },
|
| + { IDS_FLAGS_GPU_RASTERIZATION,
|
| + cc::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",
|
|
|