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

Fix singleton relaunch issues with multi-threaded-message-loop (fixes #3635)

Browse Source 
- Fix UI thread shutdown issues on early app exit.
- views: cefclient: Fix threading requirements in RootWindowViews::Init when
  called on the UI thread via OnAlreadyRunningAppRelaunch.
This commit is contained in:
Marshall Greenblatt
2024-01-30 16:33:39 -05:00
parent bdb070c85c
commit d3a483ef59
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libcef/browser/main_runner.cc
View File

@@ -183,12 +183,20 @@ class CefUIThread : public base::PlatformThread::Delegate {
runner_->RunMessageLoop();
browser_runner_->Shutdown();
browser_runner_.reset();
// Stop may be called before InitializeBrowserRunner if
// content::ContentMainRun was not successful (for example, due to process
// singleton relaunch).
if (browser_runner_) {
browser_runner_->Shutdown();
browser_runner_.reset();
}
// This will be a no-op if there is no BrowserTaskExecutor.
content::BrowserTaskExecutor::Shutdown();
std::move(shutdown_callback_).Run();
if (!shutdown_callback_.is_null()) {
std::move(shutdown_callback_).Run();
}
// Run exit callbacks on the UI thread to avoid sequence check failures.
base::AtExitManager::ProcessCallbacksNow();
@@ -435,6 +443,11 @@ int CefMainRunner::ContentMainRun(bool* initialized,
int* exit_code) {
runner->main_delegate_->BeforeUIThreadInitialize();
*exit_code = content::ContentMainRun(runner->main_runner_.get());
if (*exit_code != content::RESULT_CODE_NORMAL_EXIT) {
runner->FinishShutdownOnUIThread();
}
event->Signal();
},
base::Unretained(this), base::Unretained(&uithread_startup_event),
@@ -446,6 +459,13 @@ int CefMainRunner::ContentMainRun(bool* initialized,
// We need to wait until content::ContentMainRun has finished.
uithread_startup_event.Wait();
if (exit_code != content::RESULT_CODE_NORMAL_EXIT) {
// content::ContentMainRun was not successful (for example, due to process
// singleton relaunch). Stop the UI thread and block until done.
ui_thread_->Stop();
ui_thread_.reset();
}
} else {
*initialized = true;
main_delegate_->BeforeUIThreadInitialize();