Skip to content

Commit 68943f2

Browse files
OLSandermagreenblatt
authored andcommitted
Update to 139.0.17+g6c347eb+chromium-139.0.7258.31
1 parent ca49ada commit 68943f2

File tree

6 files changed

+16
-68
lines changed

6 files changed

+16
-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 "135.0.20+ge7de5c3+chromium-135.0.7049.85")
133+
set(CEF_VERSION "139.0.17+g6c347eb+chromium-139.0.7258.31")
134134
endif()
135135

136136
# Determine the platform.

java/org/cef/network/CefPostDataElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static enum Type {
1616
PDE_TYPE_EMPTY,
1717
PDE_TYPE_BYTES,
1818
PDE_TYPE_FILE,
19-
PDF_TYPE_NUM_VALUES, // probably should be PDE_TYPE, but wrong in CEF too
19+
PDE_TYPE_NUM_VALUES,
2020
}
2121

2222
// This CTOR can't be called directly. Call method create() instead.

java/tests/detailed/dialog/DevToolsDialog.java

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

java/tests/detailed/ui/MenuBar.java

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import java.awt.FlowLayout;
2323
import java.awt.event.ActionEvent;
2424
import java.awt.event.ActionListener;
25-
import java.awt.event.ComponentAdapter;
26-
import java.awt.event.ComponentEvent;
2725
import java.awt.event.WindowEvent;
2826
import java.awt.image.BufferedImage;
2927
import java.io.File;
@@ -52,7 +50,6 @@
5250
import tests.detailed.BrowserFrame;
5351
import tests.detailed.MainFrame;
5452
import tests.detailed.dialog.CookieManagerDialog;
55-
import tests.detailed.dialog.DevToolsDialog;
5653
import tests.detailed.dialog.DownloadDialog;
5754
import tests.detailed.dialog.SearchDialog;
5855
import tests.detailed.dialog.ShowTextDialog;
@@ -62,7 +59,7 @@
6259
@SuppressWarnings("serial")
6360
public class MenuBar extends JMenuBar {
6461
class SaveAs implements CefStringVisitor {
65-
private PrintWriter fileWriter_;
62+
private final PrintWriter fileWriter_;
6663

6764
public SaveAs(String fName) throws FileNotFoundException, UnsupportedEncodingException {
6865
fileWriter_ = new PrintWriter(fName, "UTF-8");
@@ -367,15 +364,7 @@ public void actionPerformed(ActionEvent e) {
367364
showDevTools.addActionListener(new ActionListener() {
368365
@Override
369366
public void actionPerformed(ActionEvent e) {
370-
DevToolsDialog devToolsDlg = new DevToolsDialog(owner_, "DEV Tools", browser_);
371-
devToolsDlg.addComponentListener(new ComponentAdapter() {
372-
@Override
373-
public void componentHidden(ComponentEvent e) {
374-
showDevTools.setEnabled(true);
375-
}
376-
});
377-
devToolsDlg.setVisible(true);
378-
showDevTools.setEnabled(false);
367+
browser.openDevTools();
379368
}
380369
});
381370
testMenu.add(showDevTools);
@@ -431,11 +420,14 @@ public void actionPerformed(ActionEvent e) {
431420
reparentButton.addActionListener(new ActionListener() {
432421
@Override
433422
public void actionPerformed(ActionEvent e) {
434-
if (reparentPending_) return;
423+
if (reparentPending_) {
424+
return;
425+
}
435426
reparentPending_ = true;
436427

437428
if (reparentButton.getText().equals("Reparent <")) {
438429
owner_.removeBrowser(new Runnable() {
430+
@Override
439431
public void run() {
440432
newFrame.add(browser_.getUIComponent(), BorderLayout.CENTER);
441433
newFrame.setBrowser(browser_);
@@ -445,6 +437,7 @@ public void run() {
445437
});
446438
} else {
447439
newFrame.removeBrowser(new Runnable() {
440+
@Override
448441
public void run() {
449442
JRootPane rootPane = (JRootPane) owner_.getComponent(0);
450443
Container container = rootPane.getContentPane();
@@ -540,12 +533,16 @@ public void run() {
540533
}
541534

542535
public void addBookmark(String name, String URL) {
543-
if (bookmarkMenu_ == null) return;
536+
if (bookmarkMenu_ == null) {
537+
return;
538+
}
544539

545540
// Test if the bookmark already exists. If yes, update URL
546541
Component[] entries = bookmarkMenu_.getMenuComponents();
547542
for (Component itemEntry : entries) {
548-
if (!(itemEntry instanceof JMenuItem)) continue;
543+
if (!(itemEntry instanceof JMenuItem)) {
544+
continue;
545+
}
549546

550547
JMenuItem item = (JMenuItem) itemEntry;
551548
if (item.getText().equals(name)) {

native/CefPostDataElement_N.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Java_org_cef_network_CefPostDataElement_1N_N_1GetType(JNIEnv* env,
9999
JNI_CASE(env, "org/cef/network/CefPostDataElement$Type", PDE_TYPE_FILE,
100100
jtype);
101101
JNI_CASE(env, "org/cef/network/CefPostDataElement$Type",
102-
PDF_TYPE_NUM_VALUES, jtype);
102+
PDE_TYPE_NUM_VALUES, jtype);
103103
}
104104
return jtype;
105105
}

native/jni_util.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
519519
ERR_CERT_VALIDITY_TOO_LONG, jerrorCode);
520520
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
521521
ERR_CERTIFICATE_TRANSPARENCY_REQUIRED, jerrorCode);
522-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
523-
ERR_CERT_SYMANTEC_LEGACY, jerrorCode);
524522
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
525523
ERR_CERT_KNOWN_INTERCEPTION_BLOCKED, jerrorCode);
526524
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode", ERR_CERT_END,

0 commit comments

Comments
 (0)