feat: JCEF w/ CEF 122.1.10+gc902316+chromium-122.0.6261.112

- Fixed merge issues - Fixed macOS building - Removal of tests (not required for our use-case) - Fix JCEF CMAKE download
CCBlueX · Mar 12, 2024 · 2d43af0 · 2d43af0
1 parent 5b2d278
commit 2d43af0
Show file tree

Hide file tree

Showing 49 changed files with 56 additions and 4,629 deletions.
diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         platform: [amd64, arm64]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install deps and build
         run: |
           sudo apt update
@@ -40,7 +40,7 @@ jobs:
       matrix:
         platform: [amd64, arm64]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Build
         run: |
@@ -61,3 +61,35 @@ jobs:
             jcef_build/windows_${{ matrix.platform }}.tar.gz
             jcef_build/windows_${{ matrix.platform }}.tar.gz.sha256
           if-no-files-found: error
+
+  java-cef-macos:
+    runs-on: [macos-12]
+    strategy:
+      matrix:
+        platform: [amd64, arm64]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - run: |
+          brew install ninja
+          brew install python
+          brew install coreutils
+          sudo xcode-select --switch /Applications/Xcode_13.1.app
+          mkdir jcef_build && cd jcef_build
+          cmake -G "Ninja" -DPROJECT_ARCH=${{ matrix.platform }} -DCMAKE_BUILD_TYPE=Release ..
+          ninja -j4
+          mv native/Release macos_${{ matrix.platform }}
+          tar -czf macos_${{ matrix.platform }}.tar.gz macos_${{ matrix.platform }}
+          sha256sum macos_${{ matrix.platform }}.tar.gz > macos_${{ matrix.platform }}.tar.gz.sha256
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          name: 'macos_${{ matrix.platform }}'
+          path: |
+            jcef_build/macos_${{ matrix.platform }}.tar.gz
+            jcef_build/macos_${{ matrix.platform }}.tar.gz.sha256
+          if-no-files-found: error
diff --git a/build.xml b/build.xml
@@ -30,7 +30,6 @@
       <compilerarg value="-XDignore.symbol.file"/>
       <classpath location="${jdk7.path}/jre/lib/rt.jar" />
       <classpath refid="class.path"/>
-      <src path="java/tests/"/>
       <src path="java/org/cef/"/>
     </javac>
     <copy todir="${out.path}">
@@ -47,11 +46,6 @@
         <include name="org/cef/**"/>
       </fileset>
     </jar>
-    <jar destfile="${out.path}/jcef-tests.jar" index="true" update="false">
-      <fileset dir="${out.path}">
-        <include name="tests/**"/>
-      </fileset>
-    </jar>
   </target>
 
   <target name="bundle" depends="jar">
@@ -64,7 +58,6 @@
                           icon="third_party/cef/res/CefIcon.icns">
       <classpath dir="${out.path}">
         <include name="jcef.jar"/>
-        <include name="jcef-tests.jar"/>
       </classpath>
       <classpath dir="third_party/jogamp/jar/">
         <include name="gluegen-rt.jar"/>

diff --git a/cmake/DownloadCEF.cmake b/cmake/DownloadCEF.cmake
@@ -8,7 +8,7 @@
 # Visit https://cef-builds.spotifycdn.com/index.html for the list of
 # supported platforms and versions.
 
-function(DownloadCEF platform branch version download_dir)
+function(DownloadCEF platform version download_dir)
   # Specify the binary distribution type and download directory.
   set(CEF_DISTRIBUTION "cef_binary_${version}_${platform}")
   set(CEF_DOWNLOAD_DIR "${download_dir}")
@@ -21,19 +21,19 @@ function(DownloadCEF platform branch version download_dir)
     set(CEF_DOWNLOAD_FILENAME "${CEF_DISTRIBUTION}.tar.bz2")
     set(CEF_DOWNLOAD_PATH "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}")
     if(NOT EXISTS "${CEF_DOWNLOAD_PATH}")
-      set(CEF_DOWNLOAD_URL "https://mcef-download.cinemamod.com/cef-builds/${branch}/${CEF_DOWNLOAD_FILENAME}")
+      set(CEF_DOWNLOAD_URL "https://cef-builds.spotifycdn.com/${CEF_DOWNLOAD_FILENAME}")
       string(REPLACE "+" "%2B" CEF_DOWNLOAD_URL_ESCAPED ${CEF_DOWNLOAD_URL})
 
       # Download the SHA1 hash for the binary distribution.
-      # message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}.sha1 from ${CEF_DOWNLOAD_URL_ESCAPED}...")
-      # file(DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}.sha1" "${CEF_DOWNLOAD_PATH}.sha1")
-      # file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1)
+      message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}.sha1 from ${CEF_DOWNLOAD_URL_ESCAPED}...")
+      file(DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}.sha1" "${CEF_DOWNLOAD_PATH}.sha1")
+      file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1)
 
       # Download the binary distribution and verify the hash.
       message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}...")
       file(
         DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}" "${CEF_DOWNLOAD_PATH}"
-        # EXPECTED_HASH SHA1=${CEF_SHA1}
+        EXPECTED_HASH SHA1=${CEF_SHA1}
         SHOW_PROGRESS
         )
     endif()

diff --git a/java/org/cef/CefClient.java b/java/org/cef/CefClient.java
@@ -4,46 +4,22 @@
 
 package org.cef;
 
-import org.cef.browser.CefBrowser;
-import org.cef.browser.CefBrowserFactory;
-import org.cef.browser.CefFrame;
-import org.cef.browser.CefMessageRouter;
-import org.cef.browser.CefRequestContext;
-import org.cef.callback.CefAuthCallback;
-import org.cef.callback.CefBeforeDownloadCallback;
-import org.cef.callback.CefCallback;
-import org.cef.callback.CefContextMenuParams;
-import org.cef.callback.CefDownloadItem;
-import org.cef.callback.CefDownloadItemCallback;
-import org.cef.callback.CefDragData;
-import org.cef.callback.CefFileDialogCallback;
-import org.cef.callback.CefJSDialogCallback;
-import org.cef.callback.CefMenuModel;
-import org.cef.callback.CefPrintDialogCallback;
-import org.cef.callback.CefPrintJobCallback;
+import org.cef.browser.*;
+import org.cef.callback.*;
 import org.cef.handler.*;
 import org.cef.misc.BoolRef;
 import org.cef.misc.CefAudioParameters;
 import org.cef.misc.CefPrintSettings;
-import org.cef.misc.StringRef;
 import org.cef.network.CefRequest;
 import org.cef.network.CefRequest.TransitionType;
-import org.cef.network.CefResponse;
-import org.cef.network.CefURLRequest;
-
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
+
+import java.awt.*;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Vector;
 import java.util.function.Consumer;
 
-import javax.swing.SwingUtilities;
-
 /**
  * Client that owns a browser and renderer.
  */

diff --git a/java/org/cef/browser/CefBrowserFactory.java b/java/org/cef/browser/CefBrowserFactory.java
@@ -13,8 +13,6 @@
 public class CefBrowserFactory {
     public static CefBrowser create(CefClient client, String url, boolean isOffscreenRendered,
                                     boolean isTransparent, CefRequestContext context, CefBrowserSettings settings) {
-        if (isOffscreenRendered)
-            return new CefBrowserOsr(client, url, isTransparent, context, settings);
-        return new CefBrowserWr(client, url, context, settings);
+        return new CefBrowserOsr(client, url, isTransparent, context, settings);
     }
 }
diff --git a/java/org/cef/browser/CefBrowserOsr.java b/java/org/cef/browser/CefBrowserOsr.java
@@ -4,6 +4,7 @@
 
 package org.cef.browser;
 
+import org.cef.CefBrowserSettings;
 import org.cef.CefClient;
 import org.cef.callback.CefDragData;
 import org.cef.handler.CefRenderHandler;
@@ -18,9 +19,6 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 /**
@@ -40,8 +38,8 @@ public class CefBrowserOsr extends CefBrowser_N implements CefRenderHandler {
     private CopyOnWriteArrayList<Consumer<CefPaintEvent>> onPaintListeners =
             new CopyOnWriteArrayList<>();
 
-    CefBrowserOsr(CefClient client, String url, boolean transparent, CefRequestContext context,
-                  CefBrowserSettings settings) {
+    protected CefBrowserOsr(CefClient client, String url, boolean transparent, CefRequestContext context,
+                            CefBrowserSettings settings) {
         this(client, url, transparent, context, null, null, settings);
     }
 
@@ -50,8 +48,6 @@ private CefBrowserOsr(CefClient client, String url, boolean transparent,
                           CefBrowserSettings settings) {
         super(client, url, context, parent, inspectAt, settings);
         isTransparent_ = transparent;
-        renderer_ = new CefRenderer(transparent);
-        createGLCanvas();
     }
 
     @Override
@@ -160,7 +156,7 @@ private void createBrowserIfRequired(boolean hasParent) {
                         getInspectAt());
             } else {
                 createBrowser(getClient(), windowHandle, getUrl(), true, isTransparent_,
-                        getRequestContext());
+                        null, getRequestContext());
             }
         } else if (hasParent && justCreated_) {
             notifyAfterParentChanged();

diff --git a/java/org/cef/browser/CefBrowser_N.java b/java/org/cef/browser/CefBrowser_N.java
@@ -7,12 +7,7 @@
 import org.cef.CefBrowserSettings;
 import org.cef.CefClient;
 import org.cef.browser.CefDevToolsClient.DevToolsException;
-import org.cef.browser.CefRequestContext;
-import org.cef.callback.CefDragData;
-import org.cef.callback.CefNativeAdapter;
-import org.cef.callback.CefPdfPrintCallback;
-import org.cef.callback.CefRunFileDialogCallback;
-import org.cef.callback.CefStringVisitor;
+import org.cef.callback.*;
 import org.cef.event.CefKeyEvent;
 import org.cef.event.CefMouseEvent;
 import org.cef.event.CefMouseWheelEvent;
@@ -22,16 +17,10 @@
 import org.cef.handler.CefWindowHandler;
 import org.cef.misc.CefPdfPrintSettings;
 import org.cef.network.CefRequest;
-import java.util.concurrent.CompletableFuture;
 
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Window;
-import java.awt.event.WindowEvent;
+import java.awt.*;
 import java.util.Vector;
-
-import javax.swing.SwingUtilities;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * This class represents all methods which are connected to the
@@ -209,7 +198,7 @@ protected final void createDevTools(CefBrowser_N parent, CefClientHandler client
         if (getNativeRef("CefBrowser") == 0 && !isPending_) {
             try {
                 isPending_ = N_CreateDevTools(
-                        parent, clientHandler, windowHandle, osr, transparent, inspectAt);
+                        parent, clientHandler, windowHandle, osr, transparent, null, inspectAt);
             } catch (UnsatisfiedLinkError err) {
                 err.printStackTrace();
             }
@@ -339,26 +328,6 @@ public CefFrame getFocusedFrame() {
         }
     }
 
-    @Override
-    public CefFrame getFrame(long identifier) {
-        try {
-            return N_GetFrame(identifier);
-        } catch (UnsatisfiedLinkError ule) {
-            ule.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public CefFrame getFrame(String name) {
-        try {
-            return N_GetFrame2(name);
-        } catch (UnsatisfiedLinkError ule) {
-            ule.printStackTrace();
-            return null;
-        }
-    }
-
     @Override
     public CefFrame getFrameByIdentifier(String identifier) {
         try {
@@ -871,9 +840,9 @@ private final native void N_Find(
     private final native void N_ReplaceMisspelling(String word);
     private final native void N_WasResized(int width, int height);
     private final native void N_Invalidate();
-    private final native void N_SendKeyEvent(KeyEvent e);
-    private final native void N_SendMouseEvent(MouseEvent e);
-    private final native void N_SendMouseWheelEvent(MouseWheelEvent e);
+    private final native void N_SendKeyEvent(CefKeyEvent e);
+    private final native void N_SendMouseEvent(CefMouseEvent e);
+    private final native void N_SendMouseWheelEvent(CefMouseWheelEvent e);
     private final native void N_DragTargetDragEnter(
             CefDragData dragData, Point pos, int modifiers, int allowed_ops);
     private final native void N_DragTargetDragOver(Point pos, int modifiers, int allowed_ops);