Skip to content

Commit

Permalink
Call SetIsShutdown after CefInitialize (fixes #3738)
Browse files Browse the repository at this point in the history
Delay shutdown checking until after CefInitialize has drained existing
task pools.
  • Loading branch information
magreenblatt committed Jul 15, 2024
1 parent 3457284 commit c4ddda4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions libcef_dll/libcef_dll.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=bc230d77e2985959bc5a6a2af80b500eec070384$
// $hash=4a4490df4b9440aeb853d6625fddb7de5741f5b0$
//

#include "include/capi/cef_app_capi.h"
Expand Down Expand Up @@ -131,12 +131,12 @@ CEF_EXPORT int cef_get_exit_code() {
CEF_EXPORT void cef_shutdown() {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

// Execute
CefShutdown();

#if DCHECK_IS_ON()
shutdown_checker::SetIsShutdown();
#endif

// Execute
CefShutdown();
}

CEF_EXPORT void cef_do_message_loop_work() {
Expand Down
8 changes: 4 additions & 4 deletions libcef_dll/wrapper/libcef_dll_wrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=16d4e51ecbe1fd8eb6915d951a84f707f73dfb1a$
// $hash=e9099c29c9695cabcedfde25b85c1f77f14cb516$
//

#include "include/capi/cef_app_capi.h"
Expand Down Expand Up @@ -119,12 +119,12 @@ NO_SANITIZE("cfi-icall") CEF_GLOBAL int CefGetExitCode() {
NO_SANITIZE("cfi-icall") CEF_GLOBAL void CefShutdown() {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

// Execute
cef_shutdown();

#if DCHECK_IS_ON()
shutdown_checker::SetIsShutdown();
#endif

// Execute
cef_shutdown();
}

NO_SANITIZE("cfi-icall") CEF_GLOBAL void CefDoMessageLoopWork() {
Expand Down
10 changes: 5 additions & 5 deletions tools/make_cpptoc_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,6 @@ def make_cpptoc_function_impl_new(cls, name, func, defined_names, base_scoped):
result += '\n'
result_len = len(result)

if is_cef_shutdown:
result += '\n\n#if DCHECK_IS_ON()'\
'\n shutdown_checker::SetIsShutdown();'\
'\n#endif\n'

# execution
result += '\n // Execute\n '

Expand Down Expand Up @@ -355,6 +350,11 @@ def make_cpptoc_function_impl_new(cls, name, func, defined_names, base_scoped):

result += ');\n'

if is_cef_shutdown:
result += '\n\n#if DCHECK_IS_ON()'\
'\n shutdown_checker::SetIsShutdown();'\
'\n#endif\n'

result_len = len(result)

# parameter restoration
Expand Down
10 changes: 5 additions & 5 deletions tools/make_ctocpp_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,6 @@ def make_ctocpp_function_impl_new(clsname, name, func, base_scoped):
result += '\n'
result_len = len(result)

if is_cef_shutdown:
result += '\n\n#if DCHECK_IS_ON()'\
'\n shutdown_checker::SetIsShutdown();'\
'\n#endif\n'

# execution
result += '\n // Execute\n '

Expand Down Expand Up @@ -369,6 +364,11 @@ def make_ctocpp_function_impl_new(clsname, name, func, base_scoped):

result += ');\n'

if is_cef_shutdown:
result += '\n\n#if DCHECK_IS_ON()'\
'\n shutdown_checker::SetIsShutdown();'\
'\n#endif\n'

result_len = len(result)

# parameter restoration
Expand Down

0 comments on commit c4ddda4

Please sign in to comment.