Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 "135.0.20+ge7de5c3+chromium-135.0.7049.85")
set(CEF_VERSION "139.0.17+g6c347eb+chromium-139.0.7258.31")
endif()

# Determine the platform.
Expand Down
2 changes: 1 addition & 1 deletion java/org/cef/network/CefPostDataElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static enum Type {
PDE_TYPE_EMPTY,
PDE_TYPE_BYTES,
PDE_TYPE_FILE,
PDF_TYPE_NUM_VALUES, // probably should be PDE_TYPE, but wrong in CEF too
PDE_TYPE_NUM_VALUES,
}

// This CTOR can't be called directly. Call method create() instead.
Expand Down
47 changes: 0 additions & 47 deletions java/tests/detailed/dialog/DevToolsDialog.java

This file was deleted.

29 changes: 13 additions & 16 deletions java/tests/detailed/ui/MenuBar.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.io.File;
Expand Down Expand Up @@ -52,7 +50,6 @@
import tests.detailed.BrowserFrame;
import tests.detailed.MainFrame;
import tests.detailed.dialog.CookieManagerDialog;
import tests.detailed.dialog.DevToolsDialog;
import tests.detailed.dialog.DownloadDialog;
import tests.detailed.dialog.SearchDialog;
import tests.detailed.dialog.ShowTextDialog;
Expand All @@ -62,7 +59,7 @@
@SuppressWarnings("serial")
public class MenuBar extends JMenuBar {
class SaveAs implements CefStringVisitor {
private PrintWriter fileWriter_;
private final PrintWriter fileWriter_;

public SaveAs(String fName) throws FileNotFoundException, UnsupportedEncodingException {
fileWriter_ = new PrintWriter(fName, "UTF-8");
Expand Down Expand Up @@ -367,15 +364,7 @@ public void actionPerformed(ActionEvent e) {
showDevTools.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
DevToolsDialog devToolsDlg = new DevToolsDialog(owner_, "DEV Tools", browser_);
devToolsDlg.addComponentListener(new ComponentAdapter() {
@Override
public void componentHidden(ComponentEvent e) {
showDevTools.setEnabled(true);
}
});
devToolsDlg.setVisible(true);
showDevTools.setEnabled(false);
browser.openDevTools();
}
});
testMenu.add(showDevTools);
Expand Down Expand Up @@ -431,11 +420,14 @@ public void actionPerformed(ActionEvent e) {
reparentButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (reparentPending_) return;
if (reparentPending_) {
return;
}
reparentPending_ = true;

if (reparentButton.getText().equals("Reparent <")) {
owner_.removeBrowser(new Runnable() {
@Override
public void run() {
newFrame.add(browser_.getUIComponent(), BorderLayout.CENTER);
newFrame.setBrowser(browser_);
Expand All @@ -445,6 +437,7 @@ public void run() {
});
} else {
newFrame.removeBrowser(new Runnable() {
@Override
public void run() {
JRootPane rootPane = (JRootPane) owner_.getComponent(0);
Container container = rootPane.getContentPane();
Expand Down Expand Up @@ -540,12 +533,16 @@ public void run() {
}

public void addBookmark(String name, String URL) {
if (bookmarkMenu_ == null) return;
if (bookmarkMenu_ == null) {
return;
}

// Test if the bookmark already exists. If yes, update URL
Component[] entries = bookmarkMenu_.getMenuComponents();
for (Component itemEntry : entries) {
if (!(itemEntry instanceof JMenuItem)) continue;
if (!(itemEntry instanceof JMenuItem)) {
continue;
}

JMenuItem item = (JMenuItem) itemEntry;
if (item.getText().equals(name)) {
Expand Down
2 changes: 1 addition & 1 deletion native/CefPostDataElement_N.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Java_org_cef_network_CefPostDataElement_1N_N_1GetType(JNIEnv* env,
JNI_CASE(env, "org/cef/network/CefPostDataElement$Type", PDE_TYPE_FILE,
jtype);
JNI_CASE(env, "org/cef/network/CefPostDataElement$Type",
PDF_TYPE_NUM_VALUES, jtype);
PDE_TYPE_NUM_VALUES, jtype);
}
return jtype;
}
Expand Down
2 changes: 0 additions & 2 deletions native/jni_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
ERR_CERT_VALIDITY_TOO_LONG, jerrorCode);
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
ERR_CERTIFICATE_TRANSPARENCY_REQUIRED, jerrorCode);
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
ERR_CERT_SYMANTEC_LEGACY, jerrorCode);
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
ERR_CERT_KNOWN_INTERCEPTION_BLOCKED, jerrorCode);
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode", ERR_CERT_END,
Expand Down