bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 119.0.6045.0 (#1204232)

Browse Source 
Mac: 13.5+ build system w/ 14.0 base SDK (Xcode 15.0) is now required.
This commit is contained in:
Marshall Greenblatt
2023-10-19 14:08:48 -04:00
parent 3476199bc5
commit b2274f534d
96 changed files with 812 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patch/patches/content_main_654986.patch
View File

@@ -1,8 +1,8 @@
diff --git content/app/content_main.cc content/app/content_main.cc
index a3c00c9743117..d596775057fb9 100644
index f70a103a45c6d..e880a7ec4b26c 100644
--- content/app/content_main.cc
+++ content/app/content_main.cc
@@ -173,11 +173,8 @@ ContentMainParams::~ContentMainParams() = default;
@@ -174,11 +174,8 @@ ContentMainParams::~ContentMainParams() = default;
ContentMainParams::ContentMainParams(ContentMainParams&&) = default;
ContentMainParams& ContentMainParams::operator=(ContentMainParams&&) = default;
@@ -16,41 +16,40 @@ index a3c00c9743117..d596775057fb9 100644
base::FeatureList::FailOnFeatureAccessWithoutFeatureList();
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// Lacros is launched with inherited priority. Revert to normal priority
@@ -185,9 +182,6 @@ RunContentProcess(ContentMainParams params,
@@ -186,9 +183,6 @@ RunContentProcess(ContentMainParams params,
base::PlatformThread::SetCurrentThreadType(base::ThreadType::kDefault);
#endif
int exit_code = -1;
-#if BUILDFLAG(IS_MAC)
- std::unique_ptr<base::apple::ScopedNSAutoreleasePool> autorelease_pool;
- base::apple::ScopedNSAutoreleasePool autorelease_pool;
-#endif
// A flag to indicate whether Main() has been called before. On Android, we
// may re-run Main() without restarting the browser process. This flag
@@ -273,12 +267,6 @@ RunContentProcess(ContentMainParams params,
@@ -274,14 +268,6 @@ RunContentProcess(ContentMainParams params,
#endif
#if BUILDFLAG(IS_MAC)
- // We need this pool for all the objects created before we get to the event
- // loop, but we don't want to leave them hanging around until the app quits.
- // Each "main" needs to flush this pool right before it goes into its main
- // event loop to get rid of the cruft.
- autorelease_pool = std::make_unique<base::apple::ScopedNSAutoreleasePool>();
- params.autorelease_pool = autorelease_pool.get();
- // event loop to get rid of the cruft. TODO(https://crbug.com/1424190): This
- // is not safe. Each main loop should create and destroy its own pool; it
- // should not be flushing the pool at the base of the autorelease pool
- // stack.
- params.autorelease_pool = &autorelease_pool;
InitializeMac();
#endif
@@ -323,16 +311,49 @@ RunContentProcess(ContentMainParams params,
@@ -331,12 +317,46 @@ RunContentProcess(ContentMainParams params,
if (IsSubprocess())
CommonSubprocessInit();
- exit_code = content_main_runner->Run();
-#if BUILDFLAG(IS_MAC)
- autorelease_pool.reset();
-#endif
+ return exit_code;
+}
+
+// This function must be marked with NO_STACK_PROTECTOR or it may crash on
+// return, see the --change-stack-guard-on-fork command line flag.
+int NO_STACK_PROTECTOR
@@ -73,28 +72,25 @@ index a3c00c9743117..d596775057fb9 100644
+ // We need this pool for all the objects created before we get to the event
+ // loop, but we don't want to leave them hanging around until the app quits.
+ // Each "main" needs to flush this pool right before it goes into its main
+ // event loop to get rid of the cruft.
+ std::unique_ptr<base::apple::ScopedNSAutoreleasePool> autorelease_pool =
+ std::make_unique<base::apple::ScopedNSAutoreleasePool>();
+ params.autorelease_pool = autorelease_pool.get();
+ // event loop to get rid of the cruft. TODO(https://crbug.com/1424190): This
+ // is not safe. Each main loop should create and destroy its own pool; it
+ // should not be flushing the pool at the base of the autorelease pool
+ // stack.
+ base::apple::ScopedNSAutoreleasePool autorelease_pool;
+ params.autorelease_pool = &autorelease_pool;
+#endif
+
+ int exit_code = ContentMainInitialize(std::move(params), content_main_runner);
+ if (exit_code >= 0)
+ return exit_code;
+ exit_code = ContentMainRun(content_main_runner);
+
+#if BUILDFLAG(IS_MAC)
+ params.autorelease_pool = nullptr;
+ autorelease_pool.reset();
+#endif
+ ContentMainShutdown(content_main_runner);
return exit_code;
}
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index 11dcd5eaabaab..ea72a69767e7c 100644
index 965b07bc43847..89da1178ca765 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -46,6 +46,7 @@
@@ -105,7 +101,7 @@ index 11dcd5eaabaab..ea72a69767e7c 100644
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
@@ -1328,6 +1329,11 @@ void ContentMainRunnerImpl::Shutdown() {
@@ -1338,6 +1339,11 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true;
}
@@ -153,7 +149,7 @@ index 283161145d792..9f3f635abdd1c 100644
if (main_argv)
setproctitle_init(main_argv);
diff --git content/public/app/content_main.h content/public/app/content_main.h
index 876ee72774be1..2b458ac4dcc7a 100644
index 44d9aa44ae430..47f916f566696 100644
--- content/public/app/content_main.h
+++ content/public/app/content_main.h
@@ -96,6 +96,13 @@ struct CONTENT_EXPORT ContentMainParams {