From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sat, 23 Jan 2021 17:47:21 +0100
Subject: Revert "flags: remove num-raster-threads"

This reverts commit 2a51528a1737e9038f7f96f29403032a6a845a25.
---
 chrome/browser/about_flags.cc       | 12 ++++++++++++
 chrome/browser/flag-metadata.json   |  5 +++++
 chrome/browser/flag_descriptions.cc |  8 ++++++++
 chrome/browser/flag_descriptions.h  |  7 +++++++
 4 files changed, 32 insertions(+)

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -304,6 +304,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = {
      "single-fullscreen,single-on-top,underlay"},
 };
 
+const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
+    {flag_descriptions::kNumRasterThreadsOne, switches::kNumRasterThreads, "1"},
+    {flag_descriptions::kNumRasterThreadsTwo, switches::kNumRasterThreads, "2"},
+    {flag_descriptions::kNumRasterThreadsThree, switches::kNumRasterThreads,
+     "3"},
+    {flag_descriptions::kNumRasterThreadsFour, switches::kNumRasterThreads,
+     "4"}};
+
 const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
     {flag_descriptions::kTouchSelectionStrategyCharacter,
@@ -3536,6 +3545,9 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-use-zoom-for-dsf", flag_descriptions::kEnableUseZoomForDsfName,
      flag_descriptions::kEnableUseZoomForDsfDescription, kOsAll,
      MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)},
+    {"num-raster-threads", flag_descriptions::kNumRasterThreadsName,
+     flag_descriptions::kNumRasterThreadsDescription, kOsAll,
+     MULTI_VALUE_TYPE(kNumRasterThreadsChoices)},
     {"enable-subresource-redirect",
      flag_descriptions::kEnableSubresourceRedirectName,
      flag_descriptions::kEnableSubresourceRedirectDescription, kOsAll,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -3828,6 +3828,11 @@
     "owners": [ "carlosil" ],
     "expiry_milestone": 92
   },
+  {
+    "name": "num-raster-threads",
+    // "owners": [ "your-team" ],
+    "expiry_milestone": -1
+  },
   {
     "name": "mobile-google-srp",
     "owners": [ "gambard", "bling-flags@google.com" ],
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1666,6 +1666,14 @@ const char kOmniboxActiveSearchEnginesDescription[] =
     "Enables a 'Your Search Engines' section on "
     "chrome://settings/searchEngines.";
 
+const char kNumRasterThreadsName[] = "Number of raster threads";
+const char kNumRasterThreadsDescription[] =
+    "Specify the number of raster threads.";
+const char kNumRasterThreadsOne[] = "1";
+const char kNumRasterThreadsTwo[] = "2";
+const char kNumRasterThreadsThree[] = "3";
+const char kNumRasterThreadsFour[] = "4";
+
 const char kOmniboxAdaptiveSuggestionsCountName[] =
     "Adaptive Omnibox Suggestions count";
 const char kOmniboxAdaptiveSuggestionsCountDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -971,6 +971,13 @@ extern const char kNotificationsSystemFlagDescription[];
 extern const char kOmniboxActiveSearchEnginesName[];
 extern const char kOmniboxActiveSearchEnginesDescription[];
 
+extern const char kNumRasterThreadsName[];
+extern const char kNumRasterThreadsDescription[];
+extern const char kNumRasterThreadsOne[];
+extern const char kNumRasterThreadsTwo[];
+extern const char kNumRasterThreadsThree[];
+extern const char kNumRasterThreadsFour[];
+
 extern const char kOmniboxAdaptiveSuggestionsCountName[];
 extern const char kOmniboxAdaptiveSuggestionsCountDescription[];
 
-- 
2.17.1