diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
| commit | 03d66a659ae5011ca0d5279cafb1596a982a06d8 (patch) | |
| tree | b8c8cd52f300381a02e32bdea5d4eae6f30262fc /www/chromium/files/patch-content_app_content__main__runner__impl.cc | |
| parent | 994552d536a08085b483ff2b59822acc5a3a744b (diff) | |
| download | ports-03d66a659ae5011ca0d5279cafb1596a982a06d8.tar.gz ports-03d66a659ae5011ca0d5279cafb1596a982a06d8.zip | |
Notes
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.cc | 18 |
1 files changed, 9 insertions, 9 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 57cb14d98fb1..32c532d1cffc 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 2019-07-24 18:58:23 UTC +--- content/app/content_main_runner_impl.cc.orig 2019-10-21 19:06:31 UTC +++ content/app/content_main_runner_impl.cc -@@ -99,17 +99,17 @@ +@@ -102,17 +102,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -21,7 +21,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -130,7 +130,7 @@ +@@ -133,7 +133,7 @@ #include "content/public/common/content_client.h" #endif @@ -30,7 +30,7 @@ #if !defined(CHROME_MULTIPLE_DLL_BROWSER) #include "content/child/field_trial.h" -@@ -322,7 +322,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -318,7 +318,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,16 +39,16 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -419,7 +419,7 @@ void PreSandboxInit() { +@@ -415,7 +415,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD - } // namespace - -@@ -477,7 +477,7 @@ int RunZygote(ContentMainDelegate* delegate) { + #if !defined(CHROME_MULTIPLE_DLL_CHILD) + void InitializeBrowserClientProcessImpl() { +@@ -482,7 +482,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -642,11 +642,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID |