Skip to content

Commit 7f53d6d

Browse files
S1artiemagreenblatt
authored andcommitted
Update to CEF version 100.0.14+g4e5ba66+chromium-100.0.4896.75
This adapts to the following CEF issues or commits: - Removed WebPlugin support (CEF issue #3047) - Removed find identifier (CEF issue #3098) - Updated net error codes
1 parent 56fb723 commit 7f53d6d

39 files changed

+50
-932
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 "95.7.14+g9f72f35+chromium-95.0.4638.69")
133+
set(CEF_VERSION "100.0.14+g4e5ba66+chromium-100.0.4896.75")
134134
endif()
135135

136136
# Determine the platform.

java/org/cef/CefClient.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.cef.network.CefRequest.TransitionType;
4747
import org.cef.network.CefResponse;
4848
import org.cef.network.CefURLRequest;
49-
import org.cef.network.CefWebPluginInfo;
5049

5150
import java.awt.Component;
5251
import java.awt.Container;
@@ -830,18 +829,13 @@ public boolean onQuotaRequest(
830829
}
831830

832831
@Override
833-
public boolean onCertificateError(CefBrowser browser, ErrorCode cert_error, String request_url,
834-
CefCallback callback) {
832+
public boolean onCertificateError(
833+
CefBrowser browser, ErrorCode cert_error, String request_url, CefCallback callback) {
835834
if (requestHandler_ != null)
836835
return requestHandler_.onCertificateError(browser, cert_error, request_url, callback);
837836
return false;
838837
}
839838

840-
@Override
841-
public void onPluginCrashed(CefBrowser browser, String pluginPath) {
842-
if (requestHandler_ != null) requestHandler_.onPluginCrashed(browser, pluginPath);
843-
}
844-
845839
@Override
846840
public void onRenderProcessTerminated(CefBrowser browser, TerminationStatus status) {
847841
if (requestHandler_ != null) requestHandler_.onRenderProcessTerminated(browser, status);

java/org/cef/browser/CefBrowser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,14 +323,12 @@ public void runFileDialog(FileDialogMode mode, String title, String defaultFileP
323323
/**
324324
* Search for some kind of text on the page.
325325
*
326-
* @param identifier can be used to have multiple searches running simultaniously.
327326
* @param searchText to be searched for.
328327
* @param forward indicates whether to search forward or backward within the page.
329328
* @param matchCase indicates whether the search should be case-sensitive.
330329
* @param findNext indicates whether this is the first request or a follow-up.
331330
*/
332-
public void find(int identifier, String searchText, boolean forward, boolean matchCase,
333-
boolean findNext);
331+
public void find(String searchText, boolean forward, boolean matchCase, boolean findNext);
334332

335333
/**
336334
* Cancel all searches that are currently going on.

java/org/cef/browser/CefBrowser_N.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,9 @@ public void printToPDF(
533533
}
534534

535535
@Override
536-
public void find(int identifier, String searchText, boolean forward, boolean matchCase,
537-
boolean findNext) {
536+
public void find(String searchText, boolean forward, boolean matchCase, boolean findNext) {
538537
try {
539-
N_Find(identifier, searchText, forward, matchCase, findNext);
538+
N_Find(searchText, forward, matchCase, findNext);
540539
} catch (UnsatisfiedLinkError ule) {
541540
ule.printStackTrace();
542541
}
@@ -795,8 +794,8 @@ private final native void N_RunFileDialog(FileDialogMode mode, String title,
795794
private final native void N_Print();
796795
private final native void N_PrintToPDF(
797796
String path, CefPdfPrintSettings settings, CefPdfPrintCallback callback);
798-
private final native void N_Find(int identifier, String searchText, boolean forward,
799-
boolean matchCase, boolean findNext);
797+
private final native void N_Find(
798+
String searchText, boolean forward, boolean matchCase, boolean findNext);
800799
private final native void N_StopFinding(boolean clearSelection);
801800
private final native void N_CloseDevTools();
802801
private final native void N_ReplaceMisspelling(String word);

java/org/cef/callback/CefWebPluginInfoVisitor.java

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

java/org/cef/callback/CefWebPluginUnstableCallback.java

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

java/org/cef/handler/CefDialogHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
package org.cef.handler;
66

7-
import java.util.Vector;
8-
97
import org.cef.browser.CefBrowser;
108
import org.cef.callback.CefFileDialogCallback;
119

10+
import java.util.Vector;
11+
1212
/**
1313
* Implement this interface to handle dialog events. The methods of this class
1414
* will be called on the browser process UI thread.

java/org/cef/handler/CefLoadHandler.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ enum ErrorCode {
6161
ERR_SSL_VERSION_OR_CIPHER_MISMATCH(-113),
6262
ERR_SSL_RENEGOTIATION_REQUESTED(-114),
6363
ERR_PROXY_AUTH_UNSUPPORTED(-115),
64-
ERR_CERT_ERROR_IN_SSL_RENEGOTIATION(-116),
6564
ERR_BAD_SSL_CLIENT_AUTH_CERT(-117),
6665
ERR_CONNECTION_TIMED_OUT(-118),
6766
ERR_HOST_RESOLVER_QUEUE_TOO_LARGE(-119),
@@ -115,6 +114,9 @@ enum ErrorCode {
115114
ERR_WRONG_VERSION_ON_EARLY_DATA(-179),
116115
ERR_TLS13_DOWNGRADE_DETECTED(-180),
117116
ERR_SSL_KEY_USAGE_INCOMPATIBLE(-181),
117+
ERR_INVALID_ECH_CONFIG_LIST(-182),
118+
ERR_ECH_NOT_NEGOTIATED(-183),
119+
ERR_ECH_FALLBACK_CERTIFICATE_INVALID(-184),
118120
ERR_CERT_COMMON_NAME_INVALID(-200),
119121
ERR_CERT_DATE_INVALID(-201),
120122
ERR_CERT_AUTHORITY_INVALID(-202),
@@ -131,7 +133,6 @@ enum ErrorCode {
131133
ERR_CERTIFICATE_TRANSPARENCY_REQUIRED(-214),
132134
ERR_CERT_SYMANTEC_LEGACY(-215),
133135
ERR_CERT_KNOWN_INTERCEPTION_BLOCKED(-217),
134-
ERR_SSL_OBSOLETE_VERSION(-218),
135136
ERR_CERT_END(-219),
136137
ERR_INVALID_URL(-300),
137138
ERR_DISALLOWED_URL_SCHEME(-301),
@@ -195,6 +196,7 @@ enum ErrorCode {
195196
ERR_HTTP2_PUSHED_RESPONSE_DOES_NOT_MATCH(-378),
196197
ERR_HTTP_RESPONSE_CODE_FAILURE(-379),
197198
ERR_QUIC_CERT_ROOT_NOT_KNOWN(-380),
199+
ERR_QUIC_GOAWAY_REQUEST_CAN_BE_RETRIED(-381),
198200
ERR_CACHE_MISS(-400),
199201
ERR_CACHE_READ_FAILURE(-401),
200202
ERR_CACHE_WRITE_FAILURE(-402),
@@ -214,6 +216,8 @@ enum ErrorCode {
214216
ERR_ADD_USER_CERT_FAILED(-503),
215217
ERR_INVALID_SIGNED_EXCHANGE(-504),
216218
ERR_INVALID_WEB_BUNDLE(-505),
219+
ERR_TRUST_TOKEN_OPERATION_FAILED(-506),
220+
ERR_TRUST_TOKEN_OPERATION_SUCCESS_WITHOUT_SENDING_REQUEST(-507),
217221
ERR_FTP_FAILED(-601),
218222
ERR_FTP_SERVICE_UNAVAILABLE(-602),
219223
ERR_FTP_TRANSFER_ABORTED(-603),
@@ -241,7 +245,9 @@ enum ErrorCode {
241245
ERR_DNS_CACHE_MISS(-804),
242246
ERR_DNS_SEARCH_EMPTY(-805),
243247
ERR_DNS_SORT_ERROR(-806),
244-
ERR_DNS_SECURE_RESOLVER_HOSTNAME_RESOLUTION_FAILED(-808);
248+
ERR_DNS_SECURE_RESOLVER_HOSTNAME_RESOLUTION_FAILED(-808),
249+
ERR_DNS_NAME_HTTPS_ONLY(-809),
250+
ERR_DNS_REQUEST_CANCELLED(-810);
245251

246252
static private final Map<Integer, ErrorCode> CODES = new HashMap<>();
247253
static {

java/org/cef/handler/CefRequestContextHandler.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,11 @@
99
import org.cef.handler.CefResourceRequestHandler;
1010
import org.cef.misc.BoolRef;
1111
import org.cef.network.CefRequest;
12-
import org.cef.network.CefWebPluginInfo;
1312

1413
/**
1514
* Implement this interface to provide handler implementations.
1615
*/
1716
public interface CefRequestContextHandler {
18-
/**
19-
* Called on multiple browser process threads before a plugin instance is loaded.
20-
* @param mime_type is the mime type of the plugin that will be loaded.
21-
* @param plugin_url is the content URL that the plugin will load and may be empty.
22-
* @param is_main_frame will be true if the plugin is being loaded in the main (top-level)
23-
* frame.
24-
* @param top_origin_url is the URL for the top-level frame that contains the plugin when
25-
* loading a specific plugin instance or empty when building the initial list of enabled
26-
* plugins for 'navigator.plugins' JavaScript state.
27-
* @param plugin_info includes additional information about the plugin that will be loaded.
28-
* |plugin_policy| is the recommended policy.
29-
* @return true to block loading of the plugin.
30-
*/
31-
boolean onBeforePluginLoad(String mime_type, String plugin_url, boolean is_main_frame,
32-
String top_origin_url, CefWebPluginInfo plugin_info);
33-
3417
/**
3518
* Called on the IO thread before a resource request is initiated. The |browser| and |frame|
3619
* values represent the source of the request. This method will not be called if the client

java/org/cef/handler/CefRequestContextHandlerAdapter.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,13 @@
88
import org.cef.browser.CefFrame;
99
import org.cef.misc.BoolRef;
1010
import org.cef.network.CefRequest;
11-
import org.cef.network.CefWebPluginInfo;
1211

1312
/**
1413
* An abstract adapter class for receiving browser request context events.
1514
* The methods in this class are empty.
1615
* This class exists as convenience for creating handler objects.
1716
*/
1817
public abstract class CefRequestContextHandlerAdapter implements CefRequestContextHandler {
19-
@Override
20-
public boolean onBeforePluginLoad(String mime_type, String plugin_url, boolean is_main_frame,
21-
String top_origin_url, CefWebPluginInfo plugin_info) {
22-
return false;
23-
}
24-
2518
@Override
2619
public CefResourceRequestHandler getResourceRequestHandler(CefBrowser browser, CefFrame frame,
2720
CefRequest request, boolean isNavigation, boolean isDownload, String requestInitiator,

0 commit comments

Comments
 (0)