LeOSium_webview/LeOS/patches/Revert-flags-remove-num-ras...

97 lines
4.0 KiB
Diff

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.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/browser/about_flags.cc | 14 ++++++++++++++
chrome/browser/flag-metadata.json | 4 ++++
chrome/browser/flag_descriptions.cc | 8 ++++++++
chrome/browser/flag_descriptions.h | 7 +++++++
4 files changed, 33 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
@@ -398,6 +398,17 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = {
"single-fullscreen,single-on-top,underlay"},
};
+#if BUILDFLAG(IS_ANDROID)
+const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
+ {flags_ui::kGenericExperimentChoiceDefault, "", ""},
+ {flag_descriptions::kNumRasterThreadsOne, cc::switches::kNumRasterThreads, "1"},
+ {flag_descriptions::kNumRasterThreadsTwo, cc::switches::kNumRasterThreads, "2"},
+ {flag_descriptions::kNumRasterThreadsThree, cc::switches::kNumRasterThreads,
+ "3"},
+ {flag_descriptions::kNumRasterThreadsFour, cc::switches::kNumRasterThreads,
+ "4"}};
+#endif
+
const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
{flag_descriptions::kTouchSelectionStrategyCharacter,
@@ -5098,6 +5109,9 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)},
#endif
#if BUILDFLAG(IS_ANDROID)
+ {"num-raster-threads", flag_descriptions::kNumRasterThreadsName,
+ flag_descriptions::kNumRasterThreadsDescription, kOsAll,
+ MULTI_VALUE_TYPE(kNumRasterThreadsChoices)},
{"enable-site-isolation-for-password-sites",
flag_descriptions::kSiteIsolationForPasswordSitesName,
flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid,
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
@@ -5653,6 +5653,10 @@
"owners": [ "lazzzis", "aishwaryarj" ],
"expiry_milestone": 120
},
+ {
+ "name": "num-raster-threads",
+ "expiry_milestone": -1
+ },
{
"name": "messages-for-android-offer-notification",
"owners": [ "vishwasuppoor", "siashah" ],
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
@@ -2312,6 +2312,14 @@ const char kOmniboxActionsInSuggestDescription[] =
"Actions in Suggest permits optional Action Chips to be attached to "
"Entity suggestions.";
+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
@@ -1325,6 +1325,13 @@ extern const char kOmitCorsClientCertDescription[];
extern const char kOmniboxActionsInSuggestName[];
extern const char kOmniboxActionsInSuggestDescription[];
+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.25.1