Update to CEF version 104.4.23+g46ae630+chromium-104.0.5112.102

S1artie · magreenblatt · commit 0b63fb2c0e2e · 2022-08-26T14:50:34.000Z
- Adapts to CEF issue #3314: Use Chrome file dialogs on all platforms and runtimes.
- Replaces some deprecated mask constants on macOS with their newer equivalents.
diff --git 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 "100.0.14+g4e5ba66+chromium-100.0.4896.75")
+  set(CEF_VERSION "104.4.23+g46ae630+chromium-104.0.5112.102")
 endif()
 
 # Determine the platform.
diff --git a/java/org/cef/CefClient.java b/java/org/cef/CefClient.java
@@ -274,11 +274,10 @@ public void removeDialogHandler() {
 
     @Override
     public boolean onFileDialog(CefBrowser browser, FileDialogMode mode, String title,
-            String defaultFilePath, Vector<String> acceptFilters, int selectedAcceptFilter,
-            CefFileDialogCallback callback) {
+            String defaultFilePath, Vector<String> acceptFilters, CefFileDialogCallback callback) {
         if (dialogHandler_ != null && browser != null) {
-            return dialogHandler_.onFileDialog(browser, mode, title, defaultFilePath, acceptFilters,
-                    selectedAcceptFilter, callback);
+            return dialogHandler_.onFileDialog(
+                    browser, mode, title, defaultFilePath, acceptFilters, callback);
         }
         return false;
     }
diff --git a/java/org/cef/browser/CefBrowser.java b/java/org/cef/browser/CefBrowser.java
@@ -363,7 +363,7 @@ public void runFileDialog(FileDialogMode mode, String title, String defaultFileP
      * <p>
      * If executed on the AWT Event Thread, this returns an immediately resolved {@link
      * java.util.concurrent.CompletableFuture}. If executed from another thread, the {@link
-     * java.util.concurrent.CompletableFuture} returned is resolved as soon as the screenshot 
+     * java.util.concurrent.CompletableFuture} returned is resolved as soon as the screenshot
      * has been taken (which must happen on the event thread).
      * <p>
      * The generated screenshot can either be returned as-is, containing all natively-rendered
diff --git a/java/org/cef/callback/CefFileDialogCallback.java b/java/org/cef/callback/CefFileDialogCallback.java
@@ -15,11 +15,9 @@ public interface CefFileDialogCallback {
      * a single value or a list of values depending on the dialog mode. An empty
      * value is treated the same as calling Cancel().
      *
-     * @param selectedAcceptFilter 0-based index of the value selected from the
-     * accept filters array passed to CefDialogHandler::OnFileDialog.
      * @param filePaths list of selected file paths or an empty list.
      */
-    public void Continue(int selectedAcceptFilter, Vector<String> filePaths);
+    public void Continue(Vector<String> filePaths);
 
     /**
      * Cancel the file selection.
diff --git a/java/org/cef/callback/CefFileDialogCallback_N.java b/java/org/cef/callback/CefFileDialogCallback_N.java
@@ -16,9 +16,9 @@ protected void finalize() throws Throwable {
     }
 
     @Override
-    public void Continue(int selectedAcceptFilter, Vector<String> filePaths) {
+    public void Continue(Vector<String> filePaths) {
         try {
-            N_Continue(getNativeRef(null), selectedAcceptFilter, filePaths);
+            N_Continue(getNativeRef(null), filePaths);
         } catch (UnsatisfiedLinkError ule) {
             ule.printStackTrace();
         }
@@ -33,7 +33,6 @@ public void Cancel() {
         }
     }
 
-    private final native void N_Continue(
-            long self, int selectedAcceptFilter, Vector<String> filePaths);
+    private final native void N_Continue(long self, Vector<String> filePaths);
     private final native void N_Cancel(long self);
 }
diff --git a/java/org/cef/callback/CefRunFileDialogCallback.java b/java/org/cef/callback/CefRunFileDialogCallback.java
@@ -4,9 +4,10 @@
 
 package org.cef.callback;
 
-import java.util.Vector;
 import org.cef.browser.CefBrowser;
 
+import java.util.Vector;
+
 /**
  * Callback interface for CefBrowserHost::RunFileDialog. The methods of this
  * class will be called on the browser process UI thread.
@@ -18,9 +19,7 @@ public interface CefRunFileDialogCallback {
      * depending on the dialog mode. If the selection was cancelled filePaths
      * will be empty.
      *
-     * @param selectedAcceptFilter 0-based index of the value selected from
-     * the accept filters array passed to CefBrowserHost::RunFileDialog.
      * @param filePaths list of file paths or empty list.
      */
-    void onFileDialogDismissed(int selectedAcceptFilter, Vector<String> filePaths);
+    void onFileDialogDismissed(Vector<String> filePaths);
 }
diff --git a/java/org/cef/handler/CefDialogHandler.java b/java/org/cef/handler/CefDialogHandler.java
@@ -38,14 +38,11 @@ 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 selectedAcceptFilter is the 0-based index of the filter that should
-     * be selected by default.
      * @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, int selectedAcceptFilter,
-            CefFileDialogCallback callback);
+            String defaultFilePath, Vector<String> acceptFilters, CefFileDialogCallback callback);
 }
diff --git a/java/tests/detailed/ui/MenuBar.java b/java/tests/detailed/ui/MenuBar.java
@@ -121,8 +121,7 @@ public void actionPerformed(ActionEvent arg0) {
             public void actionPerformed(ActionEvent e) {
                 CefRunFileDialogCallback callback = new CefRunFileDialogCallback() {
                     @Override
-                    public void onFileDialogDismissed(
-                            int selectedAcceptFilter, Vector<String> filePaths) {
+                    public void onFileDialogDismissed(Vector<String> filePaths) {
                         if (!filePaths.isEmpty()) {
                             try {
                                 SaveAs saveContent = new SaveAs(filePaths.get(0));
@@ -493,8 +492,7 @@ public void actionPerformed(ActionEvent e) {
                 CompletableFuture<BufferedImage> shot = browser.createScreenshot(false);
                 shot.thenAccept((image) -> {
                     System.out.println("Took screenshot asynchronously in "
-                            + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start)
-                            + " msecs");
+                            + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start) + " msecs");
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
diff --git a/native/CefBrowser_N.cpp b/native/CefBrowser_N.cpp
@@ -1498,10 +1498,9 @@ Java_org_cef_browser_CefBrowser_1N_N_1RunFileDialog(JNIEnv* env,
     mode = FILE_DIALOG_OPEN;
   }
 
-  browser->GetHost()->RunFileDialog(mode, GetJNIString(env, jtitle),
-                                    GetJNIString(env, jdefaultFilePath),
-                                    accept_types, selectedAcceptFilter,
-                                    new RunFileDialogCallback(env, jcallback));
+  browser->GetHost()->RunFileDialog(
+      mode, GetJNIString(env, jtitle), GetJNIString(env, jdefaultFilePath),
+      accept_types, new RunFileDialogCallback(env, jcallback));
 }
 
 JNIEXPORT void JNICALL
diff --git a/native/CefFileDialogCallback_N.cpp b/native/CefFileDialogCallback_N.cpp
@@ -22,19 +22,17 @@ void ClearSelf(JNIEnv* env, jobject obj) {
 }  // namespace
 
 JNIEXPORT void JNICALL
-Java_org_cef_callback_CefFileDialogCallback_1N_N_1Continue(
-    JNIEnv* env,
-    jobject obj,
-    jlong self,
-    jint selectedAcceptFilter,
-    jobject jFilePaths) {
+Java_org_cef_callback_CefFileDialogCallback_1N_N_1Continue(JNIEnv* env,
+                                                           jobject obj,
+                                                           jlong self,
+                                                           jobject jFilePaths) {
   CefRefPtr<CefFileDialogCallback> callback = GetSelf(self);
   if (!callback)
     return;
 
   std::vector<CefString> filePaths;
   GetJNIStringVector(env, jFilePaths, filePaths);
-  callback->Continue(selectedAcceptFilter, filePaths);
+  callback->Continue(filePaths);
 
   ClearSelf(env, obj);
 }
diff --git a/native/CefMessageRouter_N.cpp b/native/CefMessageRouter_N.cpp
@@ -109,12 +109,11 @@ Java_org_cef_browser_CefMessageRouter_1N_N_1RemoveHandler(
                             },
                             msgRouter, routerHandler));
   }
-  
-  
+
   // Remove JNI reference on jrouterhandler added by the ScopedJNIObject
   SetCefForJNIObject<MessageRouterHandler>(env, jrouterHandler, nullptr,
                                            "CefMessageRouterHandler");
-  
+
   return JNI_TRUE;
 }
 
diff --git a/native/dialog_handler.cpp b/native/dialog_handler.cpp
@@ -32,7 +32,6 @@ bool DialogHandler::OnFileDialog(CefRefPtr<CefBrowser> browser,
                                  const CefString& title,
                                  const CefString& default_file_path,
                                  const std::vector<CefString>& accept_filters,
-                                 int selected_accept_filter,
                                  CefRefPtr<CefFileDialogCallback> callback) {
   ScopedJNIEnv env;
   if (!env)
@@ -62,10 +61,9 @@ bool DialogHandler::OnFileDialog(CefRefPtr<CefBrowser> browser,
       env, handle_, "onFileDialog",
       "(Lorg/cef/browser/CefBrowser;Lorg/cef/handler/"
       "CefDialogHandler$FileDialogMode;Ljava/lang/String;Ljava/lang/"
-      "String;Ljava/util/Vector;ILorg/cef/callback/CefFileDialogCallback;)Z",
+      "String;Ljava/util/Vector;Lorg/cef/callback/CefFileDialogCallback;)Z",
       Boolean, jreturn, jbrowser.get(), jmode.get(), jtitle.get(),
-      jdefaultFilePath.get(), jacceptFilters.get(), selected_accept_filter,
-      jcallback.get());
+      jdefaultFilePath.get(), jacceptFilters.get(), jcallback.get());
 
   if (jreturn == JNI_FALSE) {
     // If the Java method returns "false" the callback won't be used and
diff --git a/native/dialog_handler.h b/native/dialog_handler.h
@@ -22,7 +22,6 @@ class DialogHandler : public CefDialogHandler {
                             const CefString& title,
                             const CefString& default_file_path,
                             const std::vector<CefString>& accept_filters,
-                            int selected_accept_filter,
                             CefRefPtr<CefFileDialogCallback> callback) override;
 
  protected:
diff --git a/native/run_file_dialog_callback.cpp b/native/run_file_dialog_callback.cpp
@@ -12,14 +12,12 @@ RunFileDialogCallback::RunFileDialogCallback(JNIEnv* env, jobject jcallback)
     : handle_(env, jcallback) {}
 
 void RunFileDialogCallback::OnFileDialogDismissed(
-    int selected_accept_filter,
     const std::vector<CefString>& file_paths) {
   ScopedJNIEnv env;
   if (!env)
     return;
 
   ScopedJNIObjectLocal jfilePaths(env, NewJNIStringVector(env, file_paths));
   JNI_CALL_VOID_METHOD(env, handle_, "onFileDialogDismissed",
-                       "(ILjava/util/Vector;)V", selected_accept_filter,
-                       jfilePaths.get());
+                       "(Ljava/util/Vector;)V", jfilePaths.get());
 }
diff --git a/native/run_file_dialog_callback.h b/native/run_file_dialog_callback.h
@@ -19,7 +19,6 @@ class RunFileDialogCallback : public CefRunFileDialogCallback {
 
   // RunFileDialogCallback methods
   virtual void OnFileDialogDismissed(
-      int selected_accept_filter,
       const std::vector<CefString>& file_paths) override;
 
  protected:
diff --git a/native/temp_window_mac.mm b/native/temp_window_mac.mm
@@ -21,7 +21,7 @@
 
   // Create a borderless non-visible 1x1 window.
   window_ = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1)
-                                        styleMask:NSBorderlessWindowMask
+                                        styleMask:NSWindowStyleMaskBorderless
                                           backing:NSBackingStoreBuffered
                                             defer:NO];
   CHECK(window_);
diff --git a/native/util_mac.mm b/native/util_mac.mm
@@ -95,19 +95,19 @@ + (void)load {
   method_exchangeImplementations(originalTerm, swizzledTerm);
 
   g_mouse_monitor_ = [NSEvent
-      addLocalMonitorForEventsMatchingMask:(NSLeftMouseDownMask |
-                                            NSLeftMouseUpMask |
-                                            NSLeftMouseDraggedMask |
-                                            NSRightMouseDownMask |
-                                            NSRightMouseUpMask |
-                                            NSRightMouseDraggedMask |
-                                            NSOtherMouseDownMask |
-                                            NSOtherMouseUpMask |
-                                            NSOtherMouseDraggedMask |
-                                            NSScrollWheelMask |
-                                            NSMouseMovedMask |
-                                            NSMouseEnteredMask |
-                                            NSMouseExitedMask)
+      addLocalMonitorForEventsMatchingMask:(NSEventMaskLeftMouseDown |
+                                            NSEventMaskLeftMouseUp |
+                                            NSEventMaskLeftMouseDragged |
+                                            NSEventMaskRightMouseDown |
+                                            NSEventMaskRightMouseUp |
+                                            NSEventMaskRightMouseDragged |
+                                            NSEventMaskOtherMouseDown |
+                                            NSEventMaskOtherMouseUp |
+                                            NSEventMaskOtherMouseDragged |
+                                            NSEventMaskScrollWheel |
+                                            NSEventMaskMouseMoved |
+                                            NSEventMaskMouseEntered |
+                                            NSEventMaskMouseExited)
                                    handler:^(NSEvent* evt) {
                                      // Get corresponding CefWindowHandle of
                                      // Java-Canvas
@@ -141,37 +141,37 @@ + (void)load {
                                      // Forward mouse event to browsers parent
                                      // (JCEF UI)
                                      switch ([evt type]) {
-                                       case NSLeftMouseDown:
-                                       case NSOtherMouseDown:
-                                       case NSRightMouseDown:
+                                       case NSEventTypeLeftMouseDown:
+                                       case NSEventTypeOtherMouseDown:
+                                       case NSEventTypeRightMouseDown:
                                          [[browser superview] mouseDown:evt];
                                          return evt;
 
-                                       case NSLeftMouseUp:
-                                       case NSOtherMouseUp:
-                                       case NSRightMouseUp:
+                                       case NSEventTypeLeftMouseUp:
+                                       case NSEventTypeOtherMouseUp:
+                                       case NSEventTypeRightMouseUp:
                                          [[browser superview] mouseUp:evt];
                                          return evt;
 
-                                       case NSLeftMouseDragged:
-                                       case NSOtherMouseDragged:
-                                       case NSRightMouseDragged:
+                                       case NSEventTypeLeftMouseDragged:
+                                       case NSEventTypeOtherMouseDragged:
+                                       case NSEventTypeRightMouseDragged:
                                          [[browser superview] mouseDragged:evt];
                                          return evt;
 
-                                       case NSMouseMoved:
+                                       case NSEventTypeMouseMoved:
                                          [[browser superview] mouseMoved:evt];
                                          return evt;
 
-                                       case NSMouseEntered:
+                                       case NSEventTypeMouseEntered:
                                          [[browser superview] mouseEntered:evt];
                                          return evt;
 
-                                       case NSMouseExited:
+                                       case NSEventTypeMouseExited:
                                          [[browser superview] mouseExited:evt];
                                          return evt;
 
-                                       case NSScrollWheel:
+                                       case NSEventTypeScrollWheel:
                                          [[browser superview] scrollWheel:evt];
                                          return evt;
 

Original file line number	Diff line number	Diff line change
`@@ -274,11 +274,10 @@ public void removeDialogHandler() {`
`274`	`274`
`275`	`275`	`@Override`
`276`	`276`	`public boolean onFileDialog(CefBrowser browser, FileDialogMode mode, String title,`
`277`		`- String defaultFilePath, Vector<String> acceptFilters, int selectedAcceptFilter,`
`278`		`- CefFileDialogCallback callback) {`
	`277`	`+ String defaultFilePath, Vector<String> acceptFilters, CefFileDialogCallback callback) {`
`279`	`278`	`if (dialogHandler_ != null && browser != null) {`
`280`		`- return dialogHandler_.onFileDialog(browser, mode, title, defaultFilePath, acceptFilters,`
`281`		`- selectedAcceptFilter, callback);`
	`279`	`+ return dialogHandler_.onFileDialog(`
	`280`	`+ browser, mode, title, defaultFilePath, acceptFilters, callback);`
`282`	`281`	`}`
`283`	`282`	`return false;`
`284`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ protected void finalize() throws Throwable {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Override`
`19`		`- public void Continue(int selectedAcceptFilter, Vector<String> filePaths) {`
	`19`	`+ public void Continue(Vector<String> filePaths) {`
`20`	`20`	`try {`
`21`		`- N_Continue(getNativeRef(null), selectedAcceptFilter, filePaths);`
	`21`	`+ N_Continue(getNativeRef(null), filePaths);`
`22`	`22`	`} catch (UnsatisfiedLinkError ule) {`
`23`	`23`	`ule.printStackTrace();`
`24`	`24`	`}`
`@@ -33,7 +33,6 @@ public void Cancel() {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- private final native void N_Continue(`
`37`		`- long self, int selectedAcceptFilter, Vector<String> filePaths);`
	`36`	`+ private final native void N_Continue(long self, Vector<String> filePaths);`
`38`	`37`	`private final native void N_Cancel(long self);`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1498,10 +1498,9 @@ Java_org_cef_browser_CefBrowser_1N_N_1RunFileDialog(JNIEnv* env,`
`1498`	`1498`	`mode = FILE_DIALOG_OPEN;`
`1499`	`1499`	`}`
`1500`	`1500`
`1501`		`- browser->GetHost()->RunFileDialog(mode, GetJNIString(env, jtitle),`
`1502`		`- GetJNIString(env, jdefaultFilePath),`
`1503`		`- accept_types, selectedAcceptFilter,`
`1504`		`- new RunFileDialogCallback(env, jcallback));`
	`1501`	`+ browser->GetHost()->RunFileDialog(`
	`1502`	`+ mode, GetJNIString(env, jtitle), GetJNIString(env, jdefaultFilePath),`
	`1503`	`+ accept_types, new RunFileDialogCallback(env, jcallback));`
`1505`	`1504`	`}`
`1506`	`1505`
`1507`	`1506`	`JNIEXPORT void JNICALL`