aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_app_content__main__runner__impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-content_app_content__main__runner__impl.cc')
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index 79d200357ac4..fc29048b83c7 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2021-05-12 22:05:52 UTC
+--- content/app/content_main_runner_impl.cc.orig 2021-07-19 18:45:15 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -138,7 +138,7 @@
+@@ -137,7 +137,7 @@
#endif // OS_POSIX || OS_FUCHSIA
@@ -9,7 +9,7 @@
#include "base/native_library.h"
#include "base/rand_util.h"
#include "content/public/common/zygote/sandbox_support_linux.h"
-@@ -158,7 +158,7 @@
+@@ -157,7 +157,7 @@
#include "content/public/common/content_client.h"
#endif
@@ -18,7 +18,7 @@
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
#include "content/browser/sandbox_host_linux.h"
-@@ -311,7 +311,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -310,7 +310,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -27,7 +27,7 @@
#if BUILDFLAG(ENABLE_PLUGINS)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -402,7 +402,7 @@ void PreSandboxInit() {
+@@ -401,7 +401,7 @@ void PreSandboxInit() {
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -36,7 +36,7 @@
mojo::ScopedMessagePipeHandle MaybeAcceptMojoInvitation() {
const auto& command_line = *base::CommandLine::ForCurrentProcess();
-@@ -533,7 +533,7 @@ int RunZygote(ContentMainDelegate* delegate) {
+@@ -532,7 +532,7 @@ int RunZygote(ContentMainDelegate* delegate) {
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -45,7 +45,7 @@
PreSandboxInit();
#endif
-@@ -928,7 +928,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow
+@@ -927,7 +927,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow
mojo::core::InitFeatures();
}
@@ -54,7 +54,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -938,7 +938,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow
+@@ -937,7 +937,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow
CHECK_EQ(mojo::LoadCoreLibrary(GetMojoCoreSharedLibraryPath()),
MOJO_RESULT_OK);
}