Skip to content

Commit

Permalink
Update to CEF 127.3.1+g6cbb30e+chromium-127.0.6533.100
Browse files Browse the repository at this point in the history
Disabled signal handlers on POSIX systems and removed the previous signal
handler fix.
  • Loading branch information
Rigner authored and magreenblatt committed Aug 13, 2024
1 parent 7a13412 commit 99c2f7a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 68 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)

# Specify the CEF distribution version.
if(NOT DEFINED CEF_VERSION)
set(CEF_VERSION "126.2.0+g5c56e98+chromium-126.0.6478.62")
set(CEF_VERSION "127.3.1+g6cbb30e+chromium-127.0.6533.100")
endif()

# Determine the platform.
Expand Down
4 changes: 0 additions & 4 deletions native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,13 @@ set(JCEF_SRCS
set(JCEF_SRCS_LINUX
critical_wait_posix.cpp
jni_util_linux.cpp
signal_restore_posix.cpp
signal_restore_posix.h
temp_window_x11.cc
temp_window_x11.h
util_linux.cpp
util_posix.cpp
)
set(JCEF_SRCS_MAC
critical_wait_posix.cpp
signal_restore_posix.cpp
signal_restore_posix.h
temp_window_mac.h
temp_window_mac.mm
util_mac.h
Expand Down
19 changes: 5 additions & 14 deletions native/context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@
#include "util_mac.h"
#endif

#if defined(OS_POSIX)
#include "signal_restore_posix.h"
#endif

namespace {

Context* g_context = nullptr;

CefSettings GetJNISettings(JNIEnv* env, jobject obj) {
CefString tmp;
CefSettings settings;

#if defined(OS_POSIX) && !defined(OS_ANDROID)
settings.disable_signal_handlers = true;
#endif

if (!obj)
return settings;

Expand Down Expand Up @@ -226,23 +227,13 @@ bool Context::Initialize(JNIEnv* env,
new ClientApp(CefString(&settings.cache_path), env, appHandler));
bool res = false;

#if defined(OS_POSIX)
// CefInitialize will reset signal handlers. Backup/restore the original
// signal handlers to avoid crashes in the JVM (see issue #41).
BackupSignalHandlers();
#endif

#if defined(OS_MACOSX)
res = util_mac::CefInitializeOnMainThread(main_args, settings,
client_app.get());
#else
res = CefInitialize(main_args, settings, client_app.get(), nullptr);
#endif

#if defined(OS_POSIX)
RestoreSignalHandlers();
#endif

return res;
}

Expand Down
38 changes: 0 additions & 38 deletions native/signal_restore_posix.cpp

This file was deleted.

11 changes: 0 additions & 11 deletions native/signal_restore_posix.h

This file was deleted.

0 comments on commit 99c2f7a

Please sign in to comment.