67 lines
3.1 KiB
Diff
67 lines
3.1 KiB
Diff
|
diff -up chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/about_flags.cc
|
||
|
|
--- chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg 2021-03-04 14:02:26.379527446 -0500
|
||
|
|
+++ chromium-89.0.4389.72/chrome/browser/about_flags.cc 2021-03-04 14:06:40.208830372 -0500
|
||
|
|
@@ -3526,12 +3526,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||
|
|
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
|
||
|
|
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
|
||
|
|
#endif // ENABLE_VR
|
||
|
|
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH) || 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 // BUILDFLAG(IS_CHROMEOS_ASH)
|
||
|
|
+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX
|
||
|
|
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
|
||
|
|
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
|
||
|
|
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
|
||
|
|
diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc
|
||
|
|
--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg 2021-03-02 12:45:03.000000000 -0500
|
||
|
|
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc 2021-03-04 14:07:56.648199844 -0500
|
||
|
|
@@ -3704,12 +3704,22 @@ const char kAccountManagementFlowsV2Desc
|
||
|
|
"Settings. "
|
||
|
|
"See go/betterAM";
|
||
|
|
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (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 kAllowDisableMouseAccelerationName[] =
|
||
|
|
"Allow disabling mouse acceleration";
|
||
|
|
const char kAllowDisableMouseAccelerationDescription[] =
|
||
|
|
diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.h
|
||
|
|
--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg 2021-03-04 14:02:26.381527456 -0500
|
||
|
|
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.h 2021-03-04 14:09:10.842558552 -0500
|
||
|
|
@@ -2138,9 +2138,17 @@ extern const char kVideoToolboxVp9Decodi
|
||
|
|
extern const char kAccountManagementFlowsV2Name[];
|
||
|
|
extern const char kAccountManagementFlowsV2Description[];
|
||
|
|
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
||
|
|
+
|
||
|
|
extern const char kAcceleratedMjpegDecodeName[];
|
||
|
|
extern const char kAcceleratedMjpegDecodeDescription[];
|
||
|
|
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||
|
|
+
|
||
|
|
extern const char kAllowDisableMouseAccelerationName[];
|
||
|
|
extern const char kAllowDisableMouseAccelerationDescription[];
|
||
|
|
|