|
 |
f92ce96 |
diff -up chromium-86.0.4240.75/chrome/browser/about_flags.cc.vaapi chromium-86.0.4240.75/chrome/browser/about_flags.cc
|
|
|
f92ce96 |
--- chromium-86.0.4240.75/chrome/browser/about_flags.cc.vaapi 2020-10-07 12:38:37.000000000 -0400
|
|
|
f92ce96 |
+++ chromium-86.0.4240.75/chrome/browser/about_flags.cc 2020-10-14 15:46:27.429435196 -0400
|
|
|
f92ce96 |
@@ -3112,12 +3112,12 @@ const FeatureEntry kFeatureEntries[] = {
|
|
|
f92ce96 |
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
|
|
|
f92ce96 |
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
|
|
|
f92ce96 |
#endif // ENABLE_VR
|
|
|
f92ce96 |
-#if defined(OS_CHROMEOS)
|
|
|
f92ce96 |
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
|
|
|
f92ce96 |
{"disable-accelerated-mjpeg-decode",
|
|
|
f92ce96 |
flag_descriptions::kAcceleratedMjpegDecodeName,
|
|
|
f92ce96 |
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
|
|
|
f92ce96 |
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
|
|
|
f92ce96 |
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
|
|
|
f92ce96 |
-#endif // OS_CHROMEOS
|
|
|
f92ce96 |
+#endif // OS_CHROMEOS || OS_LINUX
|
|
|
f92ce96 |
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
|
|
|
f92ce96 |
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
|
|
|
f92ce96 |
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
|
|
|
f92ce96 |
diff -up chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc.vaapi chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc
|
|
|
f92ce96 |
--- chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc.vaapi 2020-10-07 12:38:38.000000000 -0400
|
|
|
f92ce96 |
+++ chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc 2020-10-14 15:46:27.430435203 -0400
|
|
|
f92ce96 |
@@ -3519,16 +3519,19 @@ const char kVideoToolboxVp9DecodingDescr
|
|
|
f92ce96 |
|
|
|
f92ce96 |
#endif
|
|
|
f92ce96 |
|
|
|
f92ce96 |
-// Chrome OS -------------------------------------------------------------------
|
|
|
f92ce96 |
-
|
|
|
f92ce96 |
-#if defined(OS_CHROMEOS)
|
|
|
f92ce96 |
+// Chrome OS and Linux -------------------------------------------------------------------
|
|
|
f92ce96 |
|
|
|
f92ce96 |
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
f92ce96 |
const char kAcceleratedMjpegDecodeName[] =
|
|
|
f92ce96 |
"Hardware-accelerated mjpeg decode for captured frame";
|
|
|
f92ce96 |
const char kAcceleratedMjpegDecodeDescription[] =
|
|
|
f92ce96 |
"Enable hardware-accelerated mjpeg decode for captured frame where "
|
|
|
f92ce96 |
"available.";
|
|
|
f92ce96 |
+#endif
|
|
|
f92ce96 |
|
|
|
f92ce96 |
+// Chrome OS -----------------------------------------------------------------------------
|
|
|
f92ce96 |
+
|
|
|
f92ce96 |
+#if defined(OS_CHROMEOS)
|
|
|
f92ce96 |
const char kAggregatedMlAppRankingName[] = "Rank suggested apps with ML.";
|
|
|
f92ce96 |
const char kAggregatedMlAppRankingDescription[] =
|
|
|
f92ce96 |
"Use the aggregated ML model to rank the suggested apps.";
|
|
|
f92ce96 |
diff -up chromium-86.0.4240.75/chrome/browser/flag_descriptions.h.vaapi chromium-86.0.4240.75/chrome/browser/flag_descriptions.h
|
|
|
f92ce96 |
--- chromium-86.0.4240.75/chrome/browser/flag_descriptions.h.vaapi 2020-10-14 15:46:27.431435211 -0400
|
|
|
f92ce96 |
+++ chromium-86.0.4240.75/chrome/browser/flag_descriptions.h 2020-10-14 15:56:25.774118708 -0400
|
|
|
f92ce96 |
@@ -2026,13 +2026,19 @@ extern const char kVideoToolboxVp9Decodi
|
|
|
f92ce96 |
|
|
|
f92ce96 |
#endif // defined(OS_MAC)
|
|
|
f92ce96 |
|
|
|
f92ce96 |
-// Chrome OS ------------------------------------------------------------------
|
|
|
f92ce96 |
+// Chrome OS and Linux ---------------------------------------------------------
|
|
|
f92ce96 |
|
|
|
f92ce96 |
-#if defined(OS_CHROMEOS)
|
|
|
f92ce96 |
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
f92ce96 |
|
|
|
f92ce96 |
extern const char kAcceleratedMjpegDecodeName[];
|
|
|
f92ce96 |
extern const char kAcceleratedMjpegDecodeDescription[];
|
|
|
f92ce96 |
|
|
|
f92ce96 |
+#endif
|
|
|
f92ce96 |
+
|
|
|
f92ce96 |
+// Chrome OS -------------------------------------------------------------------
|
|
|
f92ce96 |
+
|
|
|
f92ce96 |
+#if defined(OS_CHROMEOS)
|
|
|
f92ce96 |
+
|
|
|
f92ce96 |
extern const char kAggregatedMlAppRankingName[];
|
|
|
f92ce96 |
extern const char kAggregatedMlAppRankingDescription[];
|
|
|
f92ce96 |
|
|
|
f92ce96 |
diff -up chromium-86.0.4240.75/gpu/config/software_rendering_list.json.vaapi chromium-86.0.4240.75/gpu/config/software_rendering_list.json
|