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