Skip to content

Commit aab32ce

Browse files
authored
Merge pull request #18 from chromiumembedded/master
Update to 139.0.17+g6c347eb+chromium-139.0.7258.31
2 parents 94489ce + 68943f2 commit aab32ce

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
@@ -132,7 +132,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
132132

133133
# Specify the CEF distribution version.
134134
if(NOT DEFINED CEF_VERSION)
135-
set(CEF_VERSION "135.0.20+ge7de5c3+chromium-135.0.7049.85")
135+
set(CEF_VERSION "139.0.17+g6c347eb+chromium-139.0.7258.31")
136136
endif()
137137

138138
# 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;
@@ -50,7 +48,6 @@
5048
import tests.detailed.BrowserFrame;
5149
import tests.detailed.MainFrame;
5250
import tests.detailed.dialog.CookieManagerDialog;
53-
import tests.detailed.dialog.DevToolsDialog;
5451
import tests.detailed.dialog.DownloadDialog;
5552
import tests.detailed.dialog.SearchDialog;
5653
import tests.detailed.dialog.ShowTextDialog;
@@ -60,7 +57,7 @@
6057
@SuppressWarnings("serial")
6158
public class MenuBar extends JMenuBar {
6259
class SaveAs implements CefStringVisitor {
63-
private PrintWriter fileWriter_;
60+
private final PrintWriter fileWriter_;
6461

6562
public SaveAs(String fName) throws FileNotFoundException, UnsupportedEncodingException {
6663
fileWriter_ = new PrintWriter(fName, "UTF-8");
@@ -365,15 +362,7 @@ public void actionPerformed(ActionEvent e) {
365362
showDevTools.addActionListener(new ActionListener() {
366363
@Override
367364
public void actionPerformed(ActionEvent e) {
368-
DevToolsDialog devToolsDlg = new DevToolsDialog(owner_, "DEV Tools", browser_);
369-
devToolsDlg.addComponentListener(new ComponentAdapter() {
370-
@Override
371-
public void componentHidden(ComponentEvent e) {
372-
showDevTools.setEnabled(true);
373-
}
374-
});
375-
devToolsDlg.setVisible(true);
376-
showDevTools.setEnabled(false);
365+
browser.openDevTools();
377366
}
378367
});
379368
testMenu.add(showDevTools);
@@ -429,11 +418,14 @@ public void actionPerformed(ActionEvent e) {
429418
reparentButton.addActionListener(new ActionListener() {
430419
@Override
431420
public void actionPerformed(ActionEvent e) {
432-
if (reparentPending_) return;
421+
if (reparentPending_) {
422+
return;
423+
}
433424
reparentPending_ = true;
434425

435426
if (reparentButton.getText().equals("Reparent <")) {
436427
owner_.removeBrowser(new Runnable() {
428+
@Override
437429
public void run() {
438430
newFrame.setBrowser(browser_);
439431
reparentButton.setText("Reparent >");
@@ -442,6 +434,7 @@ public void run() {
442434
});
443435
} else {
444436
newFrame.removeBrowser(new Runnable() {
437+
@Override
445438
public void run() {
446439
owner_.setBrowser(browser_);
447440
owner_.revalidate();
@@ -533,12 +526,16 @@ public void run() {
533526
}
534527

535528
public void addBookmark(String name, String URL) {
536-
if (bookmarkMenu_ == null) return;
529+
if (bookmarkMenu_ == null) {
530+
return;
531+
}
537532

538533
// Test if the bookmark already exists. If yes, update URL
539534
Component[] entries = bookmarkMenu_.getMenuComponents();
540535
for (Component itemEntry : entries) {
541-
if (!(itemEntry instanceof JMenuItem)) continue;
536+
if (!(itemEntry instanceof JMenuItem)) {
537+
continue;
538+
}
542539

543540
JMenuItem item = (JMenuItem) itemEntry;
544541
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
@@ -518,8 +518,6 @@ jobject NewJNIErrorCode(JNIEnv* env, cef_errorcode_t errorCode) {
518518
ERR_CERT_VALIDITY_TOO_LONG, jerrorCode);
519519
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
520520
ERR_CERTIFICATE_TRANSPARENCY_REQUIRED, jerrorCode);
521-
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
522-
ERR_CERT_SYMANTEC_LEGACY, jerrorCode);
523521
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode",
524522
ERR_CERT_KNOWN_INTERCEPTION_BLOCKED, jerrorCode);
525523
JNI_CASE(env, "org/cef/handler/CefLoadHandler$ErrorCode", ERR_CERT_END,

0 commit comments

Comments
 (0)