73 lines
3.4 KiB
Diff
73 lines
3.4 KiB
Diff
diff -up chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/about_flags.cc
|
|
--- chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg 2020-11-19 20:51:19.000000000 -0500
|
|
+++ chromium-88.0.4324.11/chrome/browser/about_flags.cc 2020-11-30 16:14:32.393366384 -0500
|
|
@@ -3309,12 +3309,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-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc
|
|
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg 2020-11-30 16:14:32.393366384 -0500
|
|
+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc 2020-11-30 16:20:50.174195910 -0500
|
|
@@ -3572,9 +3572,9 @@ const char kVideoToolboxVp9DecodingDescr
|
|
|
|
#endif
|
|
|
|
-// Chrome OS -------------------------------------------------------------------
|
|
+// Chrome OS and Linux ---------------------------------------------------------
|
|
|
|
-#if defined(OS_CHROMEOS)
|
|
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
|
const char kAcceleratedMjpegDecodeName[] =
|
|
"Hardware-accelerated mjpeg decode for captured frame";
|
|
@@ -3582,6 +3582,12 @@ const char kAcceleratedMjpegDecodeDescri
|
|
"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-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.h
|
|
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg 2020-11-30 16:14:32.394366389 -0500
|
|
+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.h 2020-11-30 16:22:13.831601058 -0500
|
|
@@ -2068,13 +2068,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 kAllowDisableMouseAccelerationName[];
|
|
extern const char kAllowDisableMouseAccelerationDescription[];
|
|
|