diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index d0296206844a..eae36f0ff5de 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -73,3 +73,4 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch disable_custom_libcxx_on_windows.patch fix_retain_compatibility_with_msvc.patch disable_network_services_by_default.patch +unsandboxed_ppapi_processes_skip_zygote.patch diff --git a/patches/common/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/common/chromium/unsandboxed_ppapi_processes_skip_zygote.patch new file mode 100644 index 000000000000..78b09adfa5b4 --- /dev/null +++ b/patches/common/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jeremy Apthorp +Date: Tue, 16 Apr 2019 11:25:08 -0700 +Subject: unsandboxed ppapi processes skip zygote + + +diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc +index 2d57937dfffb4ea85739f27780e53c04ef087f58..39a21171b4584cc6f45e2407a02dee2609603249 100644 +--- a/content/browser/ppapi_plugin_process_host.cc ++++ b/content/browser/ppapi_plugin_process_host.cc +@@ -106,6 +106,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate + service_manager::ZygoteHandle GetZygote() override { + const base::CommandLine& browser_command_line = + *base::CommandLine::ForCurrentProcess(); ++ if (browser_command_line.HasSwitch(service_manager::switches::kNoSandbox)) { ++ return nullptr; ++ } + base::CommandLine::StringType plugin_launcher = browser_command_line + .GetSwitchValueNative(switches::kPpapiPluginLauncher); + if (is_broker_ || !plugin_launcher.empty())