2022-03-18 15:41:41 +00:00
|
|
|
Index: electron-17.1.0/chrome/browser/about_flags.cc
|
2022-01-27 22:16:50 +00:00
|
|
|
===================================================================
|
2022-03-18 15:41:41 +00:00
|
|
|
--- electron-17.1.0.orig/chrome/browser/about_flags.cc 2022-03-07 17:20:30.424811477 +0100
|
|
|
|
+++ electron-17.1.0/chrome/browser/about_flags.cc 2022-03-09 08:25:19.662417046 +0100
|
|
|
|
@@ -3822,12 +3822,12 @@ const FeatureEntry kFeatureEntries[] = {
|
2023-10-19 17:09:42 +00:00
|
|
|
#endif
|
2023-09-13 04:57:45 +00:00
|
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
2021-06-29 20:42:56 +00:00
|
|
|
#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)},
|
2022-03-18 15:41:41 +00:00
|
|
|
Index: electron-17.1.0/chrome/browser/flag_descriptions.cc
|
2022-01-27 22:16:50 +00:00
|
|
|
===================================================================
|
2022-03-18 15:41:41 +00:00
|
|
|
--- electron-17.1.0.orig/chrome/browser/flag_descriptions.cc 2022-03-07 17:20:30.960813654 +0100
|
|
|
|
+++ electron-17.1.0/chrome/browser/flag_descriptions.cc 2022-03-09 08:25:19.662417046 +0100
|
2022-07-04 09:07:38 +00:00
|
|
|
@@ -4031,12 +4031,24 @@ const char kUseAngleGL[] = "OpenGL";
|
2022-03-18 15:41:41 +00:00
|
|
|
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
2022-01-27 22:16:50 +00:00
|
|
|
|
2021-06-29 20:42:56 +00:00
|
|
|
+#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.";
|
2022-01-27 22:16:50 +00:00
|
|
|
|
2021-06-29 20:42:56 +00:00
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+// Chrome OS ------------------------------------------------------------------
|
|
|
|
+
|
|
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
+
|
2022-09-21 09:00:14 +00:00
|
|
|
const char kAdaptiveChargingForTestingName[] =
|
|
|
|
"Show adaptive charging notifications for testing";
|
|
|
|
const char kAdaptiveChargingForTestingDescription[] =
|
2022-03-18 15:41:41 +00:00
|
|
|
Index: electron-17.1.0/chrome/browser/flag_descriptions.h
|
2022-01-27 22:16:50 +00:00
|
|
|
===================================================================
|
2022-03-18 15:41:41 +00:00
|
|
|
--- electron-17.1.0.orig/chrome/browser/flag_descriptions.h 2022-03-07 17:20:30.960813654 +0100
|
|
|
|
+++ electron-17.1.0/chrome/browser/flag_descriptions.h 2022-03-09 08:25:19.666416981 +0100
|
2022-07-04 09:07:38 +00:00
|
|
|
@@ -2305,9 +2305,21 @@ extern const char kUseAngleGL[];
|
2022-03-18 15:41:41 +00:00
|
|
|
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
2022-01-27 22:16:50 +00:00
|
|
|
|
2021-06-29 20:42:56 +00:00
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+// Chrome OS and Linux --------------------------------------------------------
|
|
|
|
+
|
|
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|
|
|
+
|
|
|
|
extern const char kAcceleratedMjpegDecodeName[];
|
|
|
|
extern const char kAcceleratedMjpegDecodeDescription[];
|
2022-01-27 22:16:50 +00:00
|
|
|
|
2021-06-29 20:42:56 +00:00
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
|
|
+
|
|
|
|
+// Chrome OS ------------------------------------------------------------------
|
|
|
|
+
|
2022-09-21 09:00:14 +00:00
|
|
|
extern const char kAdaptiveChargingName[];
|
|
|
|
extern const char kAdaptiveChargingDescription[];
|
2022-01-27 22:16:50 +00:00
|
|
|
|