chore: update patches
This commit is contained in:
parent
f933c249fe
commit
1e16606524
64 changed files with 423 additions and 465 deletions
|
@ -22,12 +22,12 @@ 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 5e67fd252d6ce17d8093b81d89dec32756a8ba3b..1b93f610a23c1e1c1ec5a90bfcc9958ec06aad65 100644
|
||||
index bb60223620f6aab8d48db90ddc9f8b511834f692..24c3f7991246985947e567d90779ecb9416c8686 100644
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -400,6 +400,11 @@ class RendererSandboxedProcessLauncherDelegate
|
||||
{
|
||||
}
|
||||
@@ -392,10 +392,18 @@ class RendererSandboxedProcessLauncherDelegate
|
||||
public:
|
||||
RendererSandboxedProcessLauncherDelegate() = default;
|
||||
|
||||
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
||||
+ RendererSandboxedProcessLauncherDelegate(bool use_zygote):
|
||||
|
@ -36,9 +36,6 @@ index 5e67fd252d6ce17d8093b81d89dec32756a8ba3b..1b93f610a23c1e1c1ec5a90bfcc9958e
|
|||
+
|
||||
~RendererSandboxedProcessLauncherDelegate() override = default;
|
||||
|
||||
#if defined(OS_WIN)
|
||||
@@ -428,6 +433,9 @@ class RendererSandboxedProcessLauncherDelegate
|
||||
|
||||
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
||||
ZygoteHandle GetZygote() override {
|
||||
+ if (!use_zygote_) {
|
||||
|
@ -47,38 +44,41 @@ index 5e67fd252d6ce17d8093b81d89dec32756a8ba3b..1b93f610a23c1e1c1ec5a90bfcc9958e
|
|||
const base::CommandLine& browser_command_line =
|
||||
*base::CommandLine::ForCurrentProcess();
|
||||
base::CommandLine::StringType renderer_prefix =
|
||||
@@ -446,10 +454,13 @@ class RendererSandboxedProcessLauncherDelegate
|
||||
@@ -413,6 +421,11 @@ class RendererSandboxedProcessLauncherDelegate
|
||||
sandbox::policy::SandboxType GetSandboxType() override {
|
||||
return sandbox::policy::SandboxType::kRenderer;
|
||||
}
|
||||
|
||||
-#if defined(OS_WIN)
|
||||
private:
|
||||
+#if defined(OS_WIN)
|
||||
const bool renderer_code_integrity_enabled_;
|
||||
#endif
|
||||
+
|
||||
+ private:
|
||||
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
||||
+ bool use_zygote_ = true;
|
||||
+#endif
|
||||
};
|
||||
|
||||
const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
|
||||
@@ -1908,11 +1919,18 @@ bool RenderProcessHostImpl::Init() {
|
||||
cmd_line->PrependWrapper(renderer_prefix);
|
||||
AppendRendererCommandLine(cmd_line.get());
|
||||
|
||||
#if defined(OS_WIN)
|
||||
@@ -423,6 +436,9 @@ class RendererSandboxedProcessLauncherDelegateWin
|
||||
RendererSandboxedProcessLauncherDelegateWin(base::CommandLine* cmd_line)
|
||||
: 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);
|
||||
@@ -1832,9 +1848,15 @@ bool RenderProcessHostImpl::Init() {
|
||||
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
||||
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
|
||||
cmd_line.get());
|
||||
+#else
|
||||
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
||||
+ bool use_zygote = !cmd_line->HasSwitch(switches::kNoZygote);
|
||||
+ auto delegate = std::make_unique<RendererSandboxedProcessLauncherDelegate>(use_zygote);
|
||||
+#else
|
||||
+ auto delegate = std::make_unique<RendererSandboxedProcessLauncherDelegate>();
|
||||
+ std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
||||
+ std::make_unique<RendererSandboxedProcessLauncherDelegate>(use_zygote);
|
||||
#else
|
||||
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
||||
std::make_unique<RendererSandboxedProcessLauncherDelegate>();
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
// Spawn the child process asynchronously to avoid blocking the UI thread.
|
||||
// As long as there's no renderer prefix, we can use the zygote process
|
||||
// at this stage.
|
||||
child_process_launcher_ = std::make_unique<ChildProcessLauncher>(
|
||||
- std::make_unique<RendererSandboxedProcessLauncherDelegate>(),
|
||||
+ std::move(delegate),
|
||||
std::move(cmd_line), GetID(), this, std::move(mojo_invitation_),
|
||||
base::BindRepeating(&RenderProcessHostImpl::OnMojoError, id_),
|
||||
GetV8SnapshotFilesToPreload());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue