Merge remote-tracking branch 'origin/feat/130.1.9+gfc42567+chromium-130.0.6723.70' into feat/accelerated-paint

Author: 1zun4

CMakeLists.txt

@@ -132,7 +132,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 
 # Specify the CEF distribution version.
 if(NOT DEFINED CEF_VERSION)
-  set(CEF_VERSION "122.1.10+gc902316+chromium-122.0.6261.112")
+  set(CEF_VERSION "130.1.9+gfc42567+chromium-130.0.6723.70")
 endif()
 
 # Determine the platform.

java/org/cef/CefClient.java

@@ -212,10 +212,11 @@ public void removeDialogHandler() {
 
     @Override
     public boolean onFileDialog(CefBrowser browser, FileDialogMode mode, String title,
-                                String defaultFilePath, Vector<String> acceptFilters, CefFileDialogCallback callback) {
+            String defaultFilePath, Vector<String> acceptFilters, Vector<String> acceptExtensions,
+            Vector<String> acceptDescriptions, CefFileDialogCallback callback) {
         if (dialogHandler_ != null && browser != null) {
-            return dialogHandler_.onFileDialog(
-                    browser, mode, title, defaultFilePath, acceptFilters, callback);
+            return dialogHandler_.onFileDialog(browser, mode, title, defaultFilePath, acceptFilters,
+                    acceptExtensions, acceptDescriptions, callback);
         }
         return false;
     }
@@ -244,9 +245,9 @@ public void onTitleChange(CefBrowser browser, String title) {
     }
 
     @Override
-    public void OnFullscreenModeChange(CefBrowser browser, boolean fullscreen) {
+    public void onFullscreenModeChange(CefBrowser browser, boolean fullscreen) {
         if (displayHandler_ != null && browser != null)
-            displayHandler_.OnFullscreenModeChange(browser, fullscreen);
+            displayHandler_.onFullscreenModeChange(browser, fullscreen);
     }
 
     @Override
@@ -303,10 +304,12 @@ public void removeDownloadHandler() {
     }
 
     @Override
-    public void onBeforeDownload(CefBrowser browser, CefDownloadItem downloadItem,
-                                 String suggestedName, CefBeforeDownloadCallback callback) {
+    public boolean onBeforeDownload(CefBrowser browser, CefDownloadItem downloadItem,
+            String suggestedName, CefBeforeDownloadCallback callback) {
         if (downloadHandler_ != null && browser != null)
-            downloadHandler_.onBeforeDownload(browser, downloadItem, suggestedName, callback);
+            return downloadHandler_.onBeforeDownload(
+                    browser, downloadItem, suggestedName, callback);
+        return false;
     }
 
     @Override
@@ -766,8 +769,10 @@ public boolean onCertificateError(
     }
 
     @Override
-    public void onRenderProcessTerminated(CefBrowser browser, TerminationStatus status) {
-        if (requestHandler_ != null) requestHandler_.onRenderProcessTerminated(browser, status);
+    public void onRenderProcessTerminated(
+            CefBrowser browser, TerminationStatus status, int error_code, String error_string) {
+        if (requestHandler_ != null)
+            requestHandler_.onRenderProcessTerminated(browser, status, error_code, error_string);
     }
 
     // CefWindowHandler

java/org/cef/CefSettings.java

@@ -214,15 +214,6 @@ public ColorType clone() {
      */
     public String locales_dir_path = null;
 
-    /**
-     * Set to true to disable loading of pack files for resources and locales.
-     * A resource bundle handler must be provided for the browser and render
-     * processes via CefApp::GetResourceBundleHandler() if loading of pack files
-     * is disabled. Also configurable using the "disable-pack-loading" command-
-     * line switch.
-     */
-    public boolean pack_loading_disabled = false;
-
     /**
      * Set to a value between 1024 and 65535 to enable remote debugging on the
      * specified port. For example, if 8080 is specified the remote debugging URL
@@ -284,7 +275,6 @@ public CefSettings clone() {
         tmp.javascript_flags = javascript_flags;
         tmp.resources_dir_path = resources_dir_path;
         tmp.locales_dir_path = locales_dir_path;
-        tmp.pack_loading_disabled = pack_loading_disabled;
         tmp.remote_debugging_port = remote_debugging_port;
         tmp.uncaught_exception_stack_size = uncaught_exception_stack_size;
         if (background_color != null) tmp.background_color = background_color.clone();

java/org/cef/browser/CefBrowser.java

@@ -331,18 +331,21 @@ public void runFileDialog(FileDialogMode mode, String title, String defaultFileP
     public void stopFinding(boolean clearSelection);
 
     /**
-     * Get an instance of the DevTools to be displayed in its own window or to be
-     * embedded within your UI. Only one instance per browser is available.
+     * Get an instance of the DevTools to be displayed in its own window.
      */
-    public CefBrowser getDevTools();
+    public void openDevTools();
 
     /**
-     * Get an instance of the DevTools to be displayed in its own window or to be
-     * embedded within your UI. Only one instance per browser is available.
+     * Open an instance of the DevTools to be displayed in its own window.
      *
      * @param inspectAt a position in the UI which should be inspected.
      */
-    public CefBrowser getDevTools(Point inspectAt);
+    public void openDevTools(Point inspectAt);
+
+    /**
+     * Close the DevTools.
+     */
+    public void closeDevTools();
 
     /**
      * Get an instance of a client that can be used to leverage the DevTools

java/org/cef/browser/CefBrowser_N.java

@@ -35,7 +35,6 @@ public abstract class CefBrowser_N extends CefNativeAdapter implements CefBrowse
     private final CefRequestContext request_context_;
     private volatile CefBrowser_N parent_ = null;
     private volatile Point inspectAt_ = null;
-    private volatile CefBrowser_N devTools_ = null;
     private volatile CefDevToolsClient devToolsClient_ = null;
     private boolean closeAllowed_ = false;
     private volatile boolean isClosed_ = false;
@@ -112,7 +111,6 @@ public synchronized void onBeforeClose() {
         if (request_context_ != null) request_context_.dispose();
         if (parent_ != null) {
             parent_.closeDevTools();
-            parent_.devTools_ = null;
             parent_ = null;
         }
         if (devToolsClient_ != null) {
@@ -121,16 +119,13 @@ public synchronized void onBeforeClose() {
     }
 
     @Override
-    public CefBrowser getDevTools() {
-        return getDevTools(null);
+    public void openDevTools() {
+        openDevTools(null);
     }
 
     @Override
-    public synchronized CefBrowser getDevTools(Point inspectAt) {
-        if (devTools_ == null) {
-            devTools_ = createDevToolsBrowser(client_, url_, request_context_, this, inspectAt);
-        }
-        return devTools_;
+    public synchronized void openDevTools(Point inspectAt) {
+        createDevToolsBrowser(client_, url_, request_context_, this, inspectAt).createImmediately();
     }
 
     @Override
@@ -572,7 +567,8 @@ public void stopFinding(boolean clearSelection) {
         }
     }
 
-    protected final void closeDevTools() {
+    @Override
+    public void closeDevTools() {
         try {
             N_CloseDevTools();
         } catch (UnsatisfiedLinkError ule) {

java/org/cef/handler/CefAppHandlerAdapter.java

@@ -48,11 +48,13 @@ public void onBeforeCommandLineProcessing(String process_type, CefCommandLine co
                     case 1: {
                         // Switches can optionally have a value specified using the '=' delimiter
                         // (e.g. "-switch=value").
-                        String[] switchVals = arg.substring(switchCnt).split("=");
-                        if (switchVals.length == 2) {
-                            command_line.appendSwitchWithValue(switchVals[0], switchVals[1]);
+                        String switchStr = arg.substring(switchCnt);
+                        int index = switchStr.indexOf('=');
+                        if (index > 0) {
+                            command_line.appendSwitchWithValue(
+                                    switchStr.substring(0, index), switchStr.substring(index + 1));
                         } else {
-                            command_line.appendSwitch(switchVals[0]);
+                            command_line.appendSwitch(switchStr);
                         }
                         break;
                     }

java/org/cef/handler/CefDialogHandler.java

@@ -38,11 +38,17 @@ enum FileDialogMode {
      * "image/*"), (b) individual file extensions (e.g. ".txt" or ".png"), or (c)
      * combined description and file extension delimited using "|" and ";" (e.g.
      * "Image Types|.png;.gif;.jpg").
+     * @param acceptExtensions provides the semicolon-delimited expansion of MIME
+     * types to file extensions (if known, or empty string otherwise).
+     * @param acceptDescriptions provides the descriptions for MIME types (if known,
+     * or empty string otherwise). For example, the "image/*" mime type might
+     * have extensions ".png;.jpg;.bmp;..." and description "Image Files".
      * @param callback is a callback handler for handling own file dialogs.
      *
      * @return To display a custom dialog return true and execute callback.
      * To display the default dialog return false.
      */
     public boolean onFileDialog(CefBrowser browser, FileDialogMode mode, String title,
-            String defaultFilePath, Vector<String> acceptFilters, CefFileDialogCallback callback);
+            String defaultFilePath, Vector<String> acceptFilters, Vector<String> acceptExtensions,
+            Vector<String> acceptDescriptions, CefFileDialogCallback callback);
 }

java/org/cef/handler/CefDisplayHandler.java

@@ -33,7 +33,7 @@ public interface CefDisplayHandler {
      * @param browser The browser generating the event.
      * @param fullscreen True if fullscreen mode is on.
      */
-    public void OnFullscreenModeChange(CefBrowser browser, boolean fullscreen);
+    public void onFullscreenModeChange(CefBrowser browser, boolean fullscreen);
 
     /**
      * About to display a tooltip.

java/org/cef/handler/CefDisplayHandlerAdapter.java

@@ -25,7 +25,7 @@ public void onTitleChange(CefBrowser browser, String title) {
     }
 
     @Override
-    public void OnFullscreenModeChange(CefBrowser browser, boolean fullscreen) {
+    public void onFullscreenModeChange(CefBrowser browser, boolean fullscreen) {
         return;
     }
 

java/org/cef/handler/CefDownloadHandler.java

@@ -15,17 +15,19 @@
  */
 public interface CefDownloadHandler {
     /**
-     * Called before a download begins. By default the download will be canceled.
-     * Execute callback either asynchronously or in this method to continue the download
-     * if desired.
+     * Called before a download begins. Return true and execute |callback| either
+     * asynchronously or in this method to continue or cancel the download.
+     * Return false to proceed with default handling (cancel with Alloy style,
+     * download shelf with Chrome style). Do not keep a reference to
+     * downloadItem outside of this method.
      *
      * @param browser The desired browser.
      * @param downloadItem The item to be downloaded. Do not keep a reference to it outside this
      * method.
      * @param suggestedName is the suggested name for the download file.
      * @param callback start the download by calling the Continue method
      */
-    public void onBeforeDownload(CefBrowser browser, CefDownloadItem downloadItem,
+    public boolean onBeforeDownload(CefBrowser browser, CefDownloadItem downloadItem,
             String suggestedName, CefBeforeDownloadCallback callback);
 
     /**