63 lines
3.1 KiB
Diff
63 lines
3.1 KiB
Diff
diff -up chromium-98.0.4758.80/chrome/browser/about_flags.cc.accel-mjpeg chromium-98.0.4758.80/chrome/browser/about_flags.cc
|
|
--- chromium-98.0.4758.80/chrome/browser/about_flags.cc.accel-mjpeg 2022-02-01 00:41:40.000000000 +0000
|
|
+++ chromium-98.0.4758.80/chrome/browser/about_flags.cc 2022-02-02 19:23:15.554137616 +0000
|
|
@@ -3822,12 +3822,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-98.0.4758.80/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc
|
|
--- chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc.accel-mjpeg 2022-02-02 19:23:15.555137569 +0000
|
|
+++ chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc 2022-02-02 19:30:58.315465225 +0000
|
|
@@ -3979,7 +3979,7 @@ const char kUseAngleGL[] = "OpenGL";
|
|
|
|
// Chrome OS -------------------------------------------------------------------
|
|
|
|
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
|
const char kAcceleratedMjpegDecodeName[] =
|
|
"Hardware-accelerated mjpeg decode for captured frame";
|
|
@@ -3987,6 +3987,10 @@ const char kAcceleratedMjpegDecodeDescri
|
|
"Enable hardware-accelerated mjpeg decode for captured frame where "
|
|
"available.";
|
|
|
|
+#endif
|
|
+
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
+
|
|
const char kAllowDisableMouseAccelerationName[] =
|
|
"Allow disabling mouse acceleration";
|
|
const char kAllowDisableMouseAccelerationDescription[] =
|
|
diff -up chromium-98.0.4758.80/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-98.0.4758.80/chrome/browser/flag_descriptions.h
|
|
--- chromium-98.0.4758.80/chrome/browser/flag_descriptions.h.accel-mjpeg 2022-02-02 19:23:15.556137523 +0000
|
|
+++ chromium-98.0.4758.80/chrome/browser/flag_descriptions.h 2022-02-02 19:31:59.585595773 +0000
|
|
@@ -2297,11 +2297,15 @@ extern const char kUseAngleGL[];
|
|
|
|
// Chrome OS ------------------------------------------------------------------
|
|
|
|
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
+#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[];
|
|
|