mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 93.0.4550.0 (main) (#29751)

Browse source
This commit is contained in:
electron-roller[bot] 2021-06-22 12:17:16 -07:00 • committed by GitHub
parent c5066cce22
commit b8261f1591
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 402 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

20
patches/chromium/support_mixed_sandbox_with_zygote.patch
View file

@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 953797c2efaa9de150b6a43f6a2a59fe031af236..506888cef32304ae5b27f85f758c9fa38024dfdb 100644
index 7c4043ded7f1876c74b2d62b10b3ff66441c7cd8..6e3fd9b9fc420dc55951b9e3405dacf97f350369 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -422,10 +422,18 @@ class RendererSandboxedProcessLauncherDelegate
@@ -427,10 +427,18 @@ class RendererSandboxedProcessLauncherDelegate
public:
RendererSandboxedProcessLauncherDelegate() = default;
@ -44,7 +44,7 @@ index 953797c2efaa9de150b6a43f6a2a59fe031af236..506888cef32304ae5b27f85f758c9fa3
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
base::CommandLine::StringType renderer_prefix =
@@ -443,6 +451,11 @@ class RendererSandboxedProcessLauncherDelegate
@@ -448,6 +456,11 @@ class RendererSandboxedProcessLauncherDelegate
sandbox::policy::SandboxType GetSandboxType() override {
return sandbox::policy::SandboxType::kRenderer;
}
@ -56,20 +56,20 @@ index 953797c2efaa9de150b6a43f6a2a59fe031af236..506888cef32304ae5b27f85f758c9fa3
};
#if defined(OS_WIN)
@@ -453,6 +466,9 @@ class RendererSandboxedProcessLauncherDelegateWin
RendererSandboxedProcessLauncherDelegateWin(base::CommandLine* cmd_line)
@@ -459,6 +472,9 @@ class RendererSandboxedProcessLauncherDelegateWin
bool is_jit_disabled)
: renderer_code_integrity_enabled_(
GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
+ use_zygote_ = !cmd_line->HasSwitch(switches::kNoZygote);
+#endif
if (cmd_line->HasSwitch(switches::kJavaScriptFlags)) {
std::string js_flags =
cmd_line->GetSwitchValueASCII(switches::kJavaScriptFlags);
@@ -1984,9 +2000,15 @@ bool RenderProcessHostImpl::Init() {
if (is_jit_disabled) {
dynamic_code_can_be_disabled_ = true;
return;
@@ -2009,9 +2025,15 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
cmd_line.get());
cmd_line.get(), IsJitDisabled());
+#else
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
+ bool use_zygote = !cmd_line->HasSwitch(switches::kNoZygote);