diff options
Diffstat (limited to 'www/chromium/files/patch-sandbox_policy_sandbox__type.cc')
| -rw-r--r-- | www/chromium/files/patch-sandbox_policy_sandbox__type.cc | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc index 1e11d06c7cac..6f7c2411faec 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2022-05-19 14:06:27 UTC +--- sandbox/policy/sandbox_type.cc.orig 2022-06-17 14:20:10 UTC +++ sandbox/policy/sandbox_type.cc @@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -18,19 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -72,8 +72,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { - case Sandbox::kLibassistant: - #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) -+#if !BUILDFLAG(IS_BSD) - case Sandbox::kZygoteIntermediateSandbox: -+#endif - case Sandbox::kScreenAI: - #endif - case Sandbox::kSpeechRecognition: -@@ -125,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -39,7 +27,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -136,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -138,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -48,16 +36,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -149,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - #if BUILDFLAG(IS_MAC) - case Sandbox::kMirroring: - #endif // BUILDFLAG(IS_MAC) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - case Sandbox::kScreenAI: - #endif - case Sandbox::kSpeechRecognition: -@@ -255,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -257,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -66,16 +45,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -265,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb - return switches::kServiceSandboxWithJit; - case Sandbox::kSpeechRecognition: - return switches::kSpeechRecognitionSandbox; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - case Sandbox::kScreenAI: - return switches::kScreenAISandbox; - #endif -@@ -285,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -287,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -84,12 +54,7 @@ case Sandbox::kHardwareVideoDecoding: return switches::kHardwareVideoDecodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -369,15 +371,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( - return Sandbox::kAudio; - if (sandbox_string == switches::kSpeechRecognitionSandbox) - return Sandbox::kSpeechRecognition; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -375,11 +375,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif |