Callum Farmer
79d120bbfb
OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=1528
73 lines
3.3 KiB
Diff
73 lines
3.3 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
|
|
@@ -3526,12 +3526,12 @@
|
|
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
|
|
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
|
|
#endif // ENABLE_VR
|
|
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
{"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) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
{"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
|
|
@@ -3704,12 +3704,24 @@
|
|
"Settings. "
|
|
"See go/betterAM";
|
|
|
|
+#endif
|
|
+
|
|
+// Chrome OS and Linux --------------------------------------------------------
|
|
+
|
|
+#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 BUILDFLAG(IS_CHROMEOS_ASH)
|
|
+
|
|
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
|
|
@@ -2138,9 +2138,21 @@
|
|
extern const char kAccountManagementFlowsV2Name[];
|
|
extern const char kAccountManagementFlowsV2Description[];
|
|
|
|
+#endif
|
|
+
|
|
+// Chrome OS and Linux --------------------------------------------------------
|
|
+
|
|
+#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)
|
|
+
|
|
+// Chrome OS ------------------------------------------------------------------
|
|
+
|
|
extern const char kAllowDisableMouseAccelerationName[];
|
|
extern const char kAllowDisableMouseAccelerationDescription[];
|
|
|