diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b65a374..580fee5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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. diff --git a/java/org/cef/network/CefPostDataElement.java b/java/org/cef/network/CefPostDataElement.java index 2d32219a..576e940d 100644 --- a/java/org/cef/network/CefPostDataElement.java +++ b/java/org/cef/network/CefPostDataElement.java @@ -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. diff --git a/java/tests/detailed/dialog/DevToolsDialog.java b/java/tests/detailed/dialog/DevToolsDialog.java deleted file mode 100644 index 07a61809..00000000 --- a/java/tests/detailed/dialog/DevToolsDialog.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. - -package tests.detailed.dialog; - -import org.cef.browser.CefBrowser; - -import java.awt.BorderLayout; -import java.awt.Frame; -import java.awt.Point; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; - -import javax.swing.JDialog; - -@SuppressWarnings("serial") -public class DevToolsDialog extends JDialog { - private final CefBrowser browser_; - public DevToolsDialog(Frame owner, String title, CefBrowser browser) { - this(owner, title, browser, null); - } - - public DevToolsDialog(Frame owner, String title, CefBrowser browser, Point inspectAt) { - super(owner, title, false); - browser_ = browser; - - setLayout(new BorderLayout()); - setSize(800, 600); - setLocation(owner.getLocation().x + 20, owner.getLocation().y + 20); - - browser.openDevTools(inspectAt); - - addComponentListener(new ComponentAdapter() { - @Override - public void componentHidden(ComponentEvent e) { - dispose(); - } - }); - } - - @Override - public void dispose() { - browser_.closeDevTools(); - super.dispose(); - } -} diff --git a/java/tests/detailed/ui/MenuBar.java b/java/tests/detailed/ui/MenuBar.java index 0ed8bf1a..79ecc095 100644 --- a/java/tests/detailed/ui/MenuBar.java +++ b/java/tests/detailed/ui/MenuBar.java @@ -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; @@ -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; @@ -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"); @@ -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); @@ -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_); @@ -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(); @@ -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)) { diff --git a/native/CefPostDataElement_N.cpp b/native/CefPostDataElement_N.cpp index 63f4e695..414e7a55 100644 --- a/native/CefPostDataElement_N.cpp +++ b/native/CefPostDataElement_N.cpp @@ -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; } diff --git a/native/jni_util.cpp b/native/jni_util.cpp index 9d948330..830ff863 100644 --- a/native/jni_util.cpp +++ b/native/jni_util.cpp @@ -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,