Skip to content

Commit d3de827

Browse files
authored
Update to CEF 146.0.10+g8219561+chromium-146.0.7680.179 (#531)
Updated to CEF 146.0.10+g8219561+chromium-146.0.7680.179. Synchronized CefLoadHandler.ErrorCode and its JNI mapping with the CEF 146 error list by removing error codes that are now obsolete upstream and no longer produced by CEF. In line with previous JCEF releases, the obsolete code was removed rather than left commented out. Ran a smoke test with the 'detailed' sample. Also integrated a build based on this branch into our own software and ran some tests, no issues encountered.
1 parent cffac27 commit d3de827

3 files changed

Lines changed: 1 addition & 25 deletions

File tree

CMakeLists.txt

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

130130
# Specify the CEF distribution version.
131131
if(NOT DEFINED CEF_VERSION)
132-
set(CEF_VERSION "143.0.14+gdd46a37+chromium-143.0.7499.193")
132+
set(CEF_VERSION "146.0.10+g8219561+chromium-146.0.7680.179")
133133
endif()
134134

135135
# Determine the platform.

java/org/cef/handler/CefLoadHandler.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ enum ErrorCode {
5656
ERR_ADDRESS_UNREACHABLE(-109),
5757
ERR_SSL_CLIENT_AUTH_CERT_NEEDED(-110),
5858
ERR_TUNNEL_CONNECTION_FAILED(-111),
59-
ERR_NO_SSL_VERSIONS_ENABLED(-112),
6059
ERR_SSL_VERSION_OR_CIPHER_MISMATCH(-113),
6160
ERR_SSL_RENEGOTIATION_REQUESTED(-114),
6261
ERR_PROXY_AUTH_UNSUPPORTED(-115),
@@ -80,13 +79,10 @@ enum ErrorCode {
8079
ERR_NAME_RESOLUTION_FAILED(-137),
8180
ERR_NETWORK_ACCESS_DENIED(-138),
8281
ERR_TEMPORARILY_THROTTLED(-139),
83-
ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT(-140),
8482
ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED(-141),
8583
ERR_MSG_TOO_BIG(-142),
8684
ERR_WS_PROTOCOL_ERROR(-145),
8785
ERR_ADDRESS_IN_USE(-147),
88-
ERR_SSL_HANDSHAKE_NOT_COMPLETED(-148),
89-
ERR_SSL_BAD_PEER_PUBLIC_KEY(-149),
9086
ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN(-150),
9187
ERR_CLIENT_AUTH_CERT_TYPE_UNSUPPORTED(-151),
9288
ERR_SSL_DECRYPT_ERROR_ALERT(-153),
@@ -151,9 +147,6 @@ enum ErrorCode {
151147
ERR_MALFORMED_IDENTITY(-329),
152148
ERR_CONTENT_DECODING_FAILED(-330),
153149
ERR_NETWORK_IO_SUSPENDED(-331),
154-
ERR_SYN_REPLY_NOT_RECEIVED(-332),
155-
ERR_ENCODING_CONVERSION_FAILED(-333),
156-
ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT(-334),
157150
ERR_NO_SUPPORTED_PROXIES(-336),
158151
ERR_HTTP2_PROTOCOL_ERROR(-337),
159152
ERR_INVALID_AUTH_CREDENTIALS(-338),
@@ -228,7 +221,6 @@ enum ErrorCode {
228221
ERR_CERT_DATABASE_CHANGED(-714),
229222
ERR_DNS_MALFORMED_RESPONSE(-800),
230223
ERR_DNS_SERVER_REQUIRES_TCP(-801),
231-
ERR_DNS_SERVER_FAILED(-802),
232224
ERR_DNS_TIMED_OUT(-803),
233225
ERR_DNS_CACHE_MISS(-804),
234226
ERR_DNS_SEARCH_EMPTY(-805),

native/jni_util.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
521521
ERR_SSL_CLIENT_AUTH_CERT_NEEDED, jerrorCode);
522522
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
523523
ERR_TUNNEL_CONNECTION_FAILED, jerrorCode);
524-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
525-
ERR_NO_SSL_VERSIONS_ENABLED, jerrorCode);
526524
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
527525
ERR_SSL_VERSION_OR_CIPHER_MISMATCH, jerrorCode);
528526
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
@@ -569,8 +567,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
569567
ERR_NETWORK_ACCESS_DENIED, jerrorCode);
570568
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
571569
ERR_TEMPORARILY_THROTTLED, jerrorCode);
572-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
573-
ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT, jerrorCode);
574570
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
575571
ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED, jerrorCode);
576572
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode", ERR_MSG_TOO_BIG,
@@ -579,10 +575,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
579575
ERR_WS_PROTOCOL_ERROR, jerrorCode);
580576
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
581577
ERR_ADDRESS_IN_USE, jerrorCode);
582-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
583-
ERR_SSL_HANDSHAKE_NOT_COMPLETED, jerrorCode);
584-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
585-
ERR_SSL_BAD_PEER_PUBLIC_KEY, jerrorCode);
586578
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
587579
ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, jerrorCode);
588580
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
@@ -709,12 +701,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
709701
ERR_CONTENT_DECODING_FAILED, jerrorCode);
710702
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
711703
ERR_NETWORK_IO_SUSPENDED, jerrorCode);
712-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
713-
ERR_SYN_REPLY_NOT_RECEIVED, jerrorCode);
714-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
715-
ERR_ENCODING_CONVERSION_FAILED, jerrorCode);
716-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
717-
ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT, jerrorCode);
718704
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
719705
ERR_NO_SUPPORTED_PROXIES, jerrorCode);
720706
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
@@ -864,8 +850,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
864850
ERR_DNS_MALFORMED_RESPONSE, jerrorCode);
865851
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
866852
ERR_DNS_SERVER_REQUIRES_TCP, jerrorCode);
867-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
868-
ERR_DNS_SERVER_FAILED, jerrorCode);
869853
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
870854
ERR_DNS_TIMED_OUT, jerrorCode);
871855
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",

0 commit comments

Comments
 (0)