Skip to content

Commit 99c2f7a

Browse files
Rignermagreenblatt
authored andcommitted
Update to CEF 127.3.1+g6cbb30e+chromium-127.0.6533.100
Disabled signal handlers on POSIX systems and removed the previous signal handler fix.
1 parent 7a13412 commit 99c2f7a

File tree

5 files changed

+6
-68
lines changed

5 files changed

+6
-68
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
130130

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

136136
# Determine the platform.

native/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,13 @@ set(JCEF_SRCS
146146
set(JCEF_SRCS_LINUX
147147
critical_wait_posix.cpp
148148
jni_util_linux.cpp
149-
signal_restore_posix.cpp
150-
signal_restore_posix.h
151149
temp_window_x11.cc
152150
temp_window_x11.h
153151
util_linux.cpp
154152
util_posix.cpp
155153
)
156154
set(JCEF_SRCS_MAC
157155
critical_wait_posix.cpp
158-
signal_restore_posix.cpp
159-
signal_restore_posix.h
160156
temp_window_mac.h
161157
temp_window_mac.mm
162158
util_mac.h

native/context.cpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
#include "util_mac.h"
1414
#endif
1515

16-
#if defined(OS_POSIX)
17-
#include "signal_restore_posix.h"
18-
#endif
19-
2016
namespace {
2117

2218
Context* g_context = nullptr;
2319

2420
CefSettings GetJNISettings(JNIEnv* env, jobject obj) {
2521
CefString tmp;
2622
CefSettings settings;
23+
24+
#if defined(OS_POSIX) && !defined(OS_ANDROID)
25+
settings.disable_signal_handlers = true;
26+
#endif
27+
2728
if (!obj)
2829
return settings;
2930

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

229-
#if defined(OS_POSIX)
230-
// CefInitialize will reset signal handlers. Backup/restore the original
231-
// signal handlers to avoid crashes in the JVM (see issue #41).
232-
BackupSignalHandlers();
233-
#endif
234-
235230
#if defined(OS_MACOSX)
236231
res = util_mac::CefInitializeOnMainThread(main_args, settings,
237232
client_app.get());
238233
#else
239234
res = CefInitialize(main_args, settings, client_app.get(), nullptr);
240235
#endif
241236

242-
#if defined(OS_POSIX)
243-
RestoreSignalHandlers();
244-
#endif
245-
246237
return res;
247238
}
248239

native/signal_restore_posix.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

native/signal_restore_posix.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)