diff options
Diffstat (limited to 'www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc')
-rw-r--r-- | www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc new file mode 100644 index 000000000000..0c619fa080c5 --- /dev/null +++ b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -0,0 +1,48 @@ +--- content/browser/ppapi_plugin_process_host.cc.orig 2017-04-19 19:06:33 UTC ++++ content/browser/ppapi_plugin_process_host.cc +@@ -55,9 +55,9 @@ + + namespace content { + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + ZygoteHandle g_ppapi_zygote; +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // NOTE: changes to this class need to be reviewed by the security team. + class PpapiPluginSandboxedProcessLauncherDelegate +@@ -111,7 +111,7 @@ class PpapiPluginSandboxedProcessLaunche + return true; + } + +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + ZygoteHandle* GetZygote() override { + const base::CommandLine& browser_command_line = + *base::CommandLine::ForCurrentProcess(); +@@ -205,13 +205,13 @@ PpapiPluginProcessHost* PpapiPluginProce + return NULL; + } + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + // static + void PpapiPluginProcessHost::EarlyZygoteLaunch() { + DCHECK(!g_ppapi_zygote); + g_ppapi_zygote = CreateZygote(); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // static + void PpapiPluginProcessHost::DidCreateOutOfProcessInstance( +@@ -363,7 +363,7 @@ bool PpapiPluginProcessHost::Init(const + base::CommandLine::StringType plugin_launcher = + browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; + #else |