Revert-flags-remove-num-raster-threads.patch

This commit is contained in:
none 2021-03-07 09:13:32 +01:00
parent 9af716d54f
commit e228ddb4e4

View file

@ -13,7 +13,7 @@ This reverts commit 2a51528a1737e9038f7f96f29403032a6a845a25.
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
@@ -290,6 +290,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = {
@@ -297,6 +297,15 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = {
"single-fullscreen,single-on-top,underlay"},
};
@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
{flag_descriptions::kTouchSelectionStrategyCharacter,
@@ -3141,6 +3150,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3295,6 +3304,9 @@ const FeatureEntry kFeatureEntries[] = {
feature_engagement::kIPHDemoMode,
feature_engagement::kIPHDemoModeChoiceVariations,
"IPH_DemoMode")},
@ -42,7 +42,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
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
@@ -3360,6 +3360,11 @@
@@ -3460,6 +3460,11 @@
"owners": [ "reillyg@chromium.org" ],
"expiry_milestone": 90
},
@ -52,12 +52,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
+ "expiry_milestone": -1
+ },
{
"name": "notification-scheduler-debug-options",
"name": "notification-scheduler",
"owners": [ "//chrome/browser/notifications/scheduler/OWNERS" ],
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
@@ -1497,6 +1497,14 @@ const char kUseMultiloginEndpointName[] = "Use Multilogin endpoint.";
@@ -1523,6 +1523,14 @@ const char kUseMultiloginEndpointName[] = "Use Multilogin endpoint.";
const char kUseMultiloginEndpointDescription[] =
"Use Gaia OAuth multilogin for identity consistency.";
@ -75,7 +75,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
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
@@ -896,6 +896,13 @@ extern const char kNotificationsNativeFlagDescription[];
@@ -911,6 +911,13 @@ extern const char kNotificationsNativeFlagDescription[];
extern const char kUseMultiloginEndpointName[];
extern const char kUseMultiloginEndpointDescription[];