Merge remote-tracking branch 'upstream-bitbucket/master'

Author: locosmike

AUTHORS.txt

@@ -1,6 +1,8 @@
-# This file is an addendum to the Chromium Embedded Framework AUTHORS file.
-# Names should be added to this file like so:
-# Name or Organization <email address>
+# This file is an addendum to the Chromium Embedded Framework AUTHORS file. It
+# lists authors through March 18, 2015 when Git was introduced for source code
+# management. A list of additional authors added after that date can be found
+# by executing this command on a local Git checkout:
+# git log --all --format="%aN <%aE>" | sort -u
 
 Marshall Greenblatt <magreenblatt@gmail.com>
 Kai Klimke, censhare AG <kkl@censhare.com>

CMakeLists.txt

@@ -121,7 +121,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 
 # Specify the CEF distribution version.
 if(NOT DEFINED CEF_VERSION)
-  set(CEF_VERSION "78.2.7+g9cd8bac+chromium-78.0.3904.70")
+  set(CEF_VERSION "83.4.0+gfd6631b+chromium-83.0.4103.106")
 endif()
 
 # Determine the platform.
@@ -177,6 +177,8 @@ if(NOT PYTHON_EXECUTABLE)
   endif()
 endif()
 
+message(STATUS "Using Python: ${PYTHON_EXECUTABLE}")
+
 
 #
 # Java configuration.

build.xml

@@ -25,7 +25,8 @@
   <target name="compile">
     <mkdir dir="${out.path}"/>
     <javac encoding="UTF8" nowarn="on" deprecation="off" debug="on" includeantruntime="false" destdir="${out.path}"
-           executable="/usr/bin/javac" fork="true" memoryinitialsize="32m" memorymaximumsize="128m" includeJavaRuntime="yes">
+           executable="/usr/bin/javac" fork="true" memoryinitialsize="32m" memorymaximumsize="128m" includeJavaRuntime="yes"
+           target="1.8" source="1.8">
       <compilerarg value="-XDignore.symbol.file"/>
       <classpath location="${jdk7.path}/jre/lib/rt.jar" />
       <classpath refid="class.path"/>

java/org/cef/CefApp.java

@@ -4,20 +4,21 @@
 
 package org.cef;
 
+import org.cef.callback.CefSchemeHandlerFactory;
+import org.cef.handler.CefAppHandler;
+import org.cef.handler.CefAppHandlerAdapter;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashSet;
+
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import org.cef.callback.CefSchemeHandlerFactory;
-import org.cef.handler.CefAppHandler;
-import org.cef.handler.CefAppHandlerAdapter;
-
 /**
  * Exposes static methods for managing the global CEF context.
  */
@@ -51,8 +52,8 @@ private CefVersion(int jcefCommitNo, int cefMajor, int cefMinor, int cefPatch,
         }
 
         public String getJcefVersion() {
-            return CEF_VERSION_MAJOR + "." + CEF_VERSION_MINOR + "." + CEF_VERSION_PATCH 
-                    + "." + JCEF_COMMIT_NUMBER;
+            return CEF_VERSION_MAJOR + "." + CEF_VERSION_MINOR + "." + CEF_VERSION_PATCH + "."
+                    + JCEF_COMMIT_NUMBER;
         }
 
         public String getCefVersion() {
@@ -140,14 +141,14 @@ private CefApp(String[] args, CefSettings settings) throws UnsatisfiedLinkError
         super(args);
         if (settings != null) settings_ = settings.clone();
         if (OS.isWindows()) {
-            System.loadLibrary("jawt");
-            System.loadLibrary("chrome_elf");
-            System.loadLibrary("libcef");
+            SystemBootstrap.loadLibrary("jawt");
+            SystemBootstrap.loadLibrary("chrome_elf");
+            SystemBootstrap.loadLibrary("libcef");
 
             // Other platforms load this library in CefApp.startup().
-            System.loadLibrary("jcef");
+            SystemBootstrap.loadLibrary("jcef");
         } else if (OS.isLinux()) {
-            System.loadLibrary("cef");
+            SystemBootstrap.loadLibrary("cef");
         }
         if (appHandler_ == null) {
             appHandler_ = this;
@@ -312,7 +313,7 @@ public synchronized CefClient createClient() {
             case NEW:
                 setState(CefAppState.INITIALIZING);
                 initialize();
-            // FALL THRU
+                // FALL THRU
 
             case INITIALIZING:
             case INITIALIZED:
@@ -401,19 +402,29 @@ public void run() {
                         }
                     } else if (OS.isWindows()) {
                         if (settings.browser_subprocess_path == null) {
-                            settings.browser_subprocess_path = library_path + "\\jcef_helper.exe";
+                            Path path = Paths.get(library_path, "jcef_helper.exe");
+                            settings.browser_subprocess_path =
+                                    path.normalize().toAbsolutePath().toString();
                         }
                     } else if (OS.isLinux()) {
-                        if (settings.browser_subprocess_path == null)
-                            settings.browser_subprocess_path = library_path + "/jcef_helper";
-                        if (settings.resources_dir_path == null)
-                            settings.resources_dir_path = library_path;
-                        if (settings.locales_dir_path == null)
-                            settings.locales_dir_path = library_path + "/locales";
+                        if (settings.browser_subprocess_path == null) {
+                            Path path = Paths.get(library_path, "jcef_helper");
+                            settings.browser_subprocess_path =
+                                    path.normalize().toAbsolutePath().toString();
+                        }
+                        if (settings.resources_dir_path == null) {
+                            Path path = Paths.get(library_path);
+                            settings.resources_dir_path =
+                                    path.normalize().toAbsolutePath().toString();
+                        }
+                        if (settings.locales_dir_path == null) {
+                            Path path = Paths.get(library_path, "locales");
+                            settings.locales_dir_path =
+                                    path.normalize().toAbsolutePath().toString();
+                        }
                     }
 
-                    if (N_Initialize(library_path, appHandler_, settings))
-                        setState(CefAppState.INITIALIZED);
+                    if (N_Initialize(appHandler_, settings)) setState(CefAppState.INITIALIZED);
                 }
             };
             if (SwingUtilities.isEventDispatchThread())
@@ -517,11 +528,13 @@ public void actionPerformed(ActionEvent evt) {
      * This method must be called at the beginning of the main() method to perform platform-
      * specific startup initialization. On Linux this initializes Xlib multithreading and on
      * macOS this dynamically loads the CEF framework.
+     * @param args Command-line arguments massed to main().
+     * @return True on successful startup.
      */
-    public static final boolean startup() {
+    public static final boolean startup(String[] args) {
         if (OS.isLinux() || OS.isMacintosh()) {
-            System.loadLibrary("jcef");
-            return N_Startup();
+            SystemBootstrap.loadLibrary("jcef");
+            return N_Startup(OS.isMacintosh() ? getCefFrameworkPath(args) : null);
         }
         return true;
     }
@@ -530,7 +543,7 @@ public static final boolean startup() {
      * Get the path which contains the jcef library
      * @return The path to the jcef library
      */
-    private final String getJcefLibPath() {
+    private static final String getJcefLibPath() {
         String library_path = System.getProperty("java.library.path");
         String[] paths = library_path.split(System.getProperty("path.separator"));
         for (String path : paths) {
@@ -548,10 +561,27 @@ public boolean accept(File dir, String name) {
         return library_path;
     }
 
-    private final static native boolean N_Startup();
+    /**
+     * Get the path that contains the CEF Framework on macOS.
+     * @return The path to the CEF Framework.
+     */
+    private static final String getCefFrameworkPath(String[] args) {
+        // Check for the path on the command-line.
+        String switchPrefix = "--framework-dir-path=";
+        for (String arg : args) {
+            if (arg.startsWith(switchPrefix)) {
+                return new File(arg.substring(switchPrefix.length())).getAbsolutePath();
+            }
+        }
+
+        // Determine the path relative to the JCEF lib location in the app bundle.
+        return new File(getJcefLibPath() + "/../Frameworks/Chromium Embedded Framework.framework")
+                .getAbsolutePath();
+    }
+
+    private final static native boolean N_Startup(String pathToCefFramework);
     private final native boolean N_PreInitialize();
-    private final native boolean N_Initialize(
-            String pathToJavaDLL, CefAppHandler appHandler, CefSettings settings);
+    private final native boolean N_Initialize(CefAppHandler appHandler, CefSettings settings);
     private final native void N_Shutdown();
     private final native void N_DoMessageLoopWork();
     private final native CefVersion N_GetVersion();

java/org/cef/SystemBootstrap.java

@@ -0,0 +1,38 @@
+// Copyright (c) 2020 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 org.cef;
+
+/**
+ * To allow customization of System.load() calls by supplying a different
+ * implementation.  You'll want to call <code>setLoader</code> with your custom
+ * implementation before calling into any other CEF classes which then in turn
+ * will start triggering libraries to be loaded at runtime.
+ */
+public class SystemBootstrap {
+    /**
+     * Simple interface for how a library by name should be loaded.
+     */
+    static public interface Loader { public void loadLibrary(String libname); }
+
+    /**
+     * Default implementation is to call System.loadLibrary
+     */
+    static private Loader loader_ = new Loader() {
+        @Override
+        public void loadLibrary(String libname) {
+            System.loadLibrary(libname);
+        }
+    };
+
+    static public void setLoader(Loader loader) {
+        if (loader == null) {
+            throw new NullPointerException("Loader cannot be null");
+        }
+        loader_ = loader;
+    }
+
+    static public void loadLibrary(String libname) {
+        loader_.loadLibrary(libname);
+    }
+}

java/org/cef/browser/CefBrowserOsr.java

@@ -7,6 +7,7 @@
 import com.jogamp.nativewindow.NativeSurface;
 import com.jogamp.opengl.GLAutoDrawable;
 import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLContext;
 import com.jogamp.opengl.GLEventListener;
 import com.jogamp.opengl.GLProfile;
 import com.jogamp.opengl.awt.GLCanvas;
@@ -108,6 +109,8 @@ public void paint(Graphics g) {
             }
         };
 
+        // The GLContext will be re-initialized when changing displays, resulting in calls to
+        // dispose/init/reshape.
         canvas_.addGLEventListener(new GLEventListener() {
             @Override
             public void reshape(
@@ -243,9 +246,20 @@ public void onPopupSize(CefBrowser browser, Rectangle size) {
     @Override
     public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects,
             ByteBuffer buffer, int width, int height) {
-        canvas_.getContext().makeCurrent();
+        // if window is closing, canvas_ or opengl context could be null
+        final GLContext context = canvas_ != null ? canvas_.getContext() : null;
+
+        if (context == null) {
+            return;
+        }
+
+        // This result can occur due to GLContext re-initialization when changing displays.
+        if (context.makeCurrent() == GLContext.CONTEXT_NOT_CURRENT) {
+            return;
+        }
+
         renderer_.onPaint(canvas_.getGL().getGL2(), popup, dirtyRects, buffer, width, height);
-        canvas_.getContext().release();
+        context.release();
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 canvas_.display();

java/org/cef/browser/CefBrowserWr.java

@@ -4,12 +4,18 @@
 
 package org.cef.browser;
 
+import org.cef.CefClient;
+import org.cef.OS;
+import org.cef.handler.CefWindowHandler;
+import org.cef.handler.CefWindowHandlerAdapter;
+
 import java.awt.BorderLayout;
 import java.awt.Canvas;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.MouseInfo;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -33,11 +39,6 @@
 import javax.swing.Timer;
 import javax.swing.ToolTipManager;
 
-import org.cef.CefClient;
-import org.cef.OS;
-import org.cef.handler.CefWindowHandler;
-import org.cef.handler.CefWindowHandlerAdapter;
-
 /**
  * This class represents a windowed rendered browser.
  * The visibility of this class is "package". To create a new
@@ -49,14 +50,14 @@ class CefBrowserWr extends CefBrowser_N {
     private Rectangle content_rect_ = new Rectangle(0, 0, 0, 0);
     private long window_handle_ = 0;
     private boolean justCreated_ = false;
+    private double scaleFactor_ = 1.0;
     private Timer delayedUpdate_ = new Timer(100, new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    if (isClosed())
-                        return;
+                    if (isClosed()) return;
 
                     boolean hasCreatedUI = createBrowserIfRequired(true);
 
@@ -149,7 +150,7 @@ public int getClickCount(int event, int button) {
                     if (currTime > nextClick[idx]) {
                         nextClick[idx] = currTime
                                 + (Integer) Toolkit.getDefaultToolkit().getDesktopProperty(
-                                          "awt.multiClickInterval");
+                                        "awt.multiClickInterval");
                         clickCnt[idx] = 1;
                     } else {
                         clickCnt[idx]++;
@@ -186,7 +187,7 @@ private CefBrowserWr(CefClient client, String url, CefRequestContext context,
             @Override
             public void setBounds(int x, int y, int width, int height) {
                 super.setBounds(x, y, width, height);
-                wasResized(width, height);
+                wasResized((int) (width * scaleFactor_), (int) (height * scaleFactor_));
             }
 
             @Override
@@ -197,7 +198,7 @@ public void setBounds(Rectangle r) {
             @Override
             public void setSize(int width, int height) {
                 super.setSize(width, height);
-                wasResized(width, height);
+                wasResized((int) (width * scaleFactor_), (int) (height * scaleFactor_));
             }
 
             @Override
@@ -215,6 +216,9 @@ public void paint(Graphics g) {
                 // we're setting up a delayedUpdate timer which is reset each time
                 // paint is called. This prevents the us of sending the UI update too
                 // often.
+                if (g instanceof Graphics2D) {
+                    scaleFactor_ = ((Graphics2D) g).getTransform().getScaleX();
+                }
                 doUpdate();
                 delayedUpdate_.restart();
             }
@@ -344,7 +348,10 @@ private static long getWindowHandle(Component component) {
     private void doUpdate() {
         if (isClosed()) return;
 
-        Rectangle clipping = ((JPanel) component_).getVisibleRect();
+        Rectangle vr = ((JPanel) component_).getVisibleRect();
+        Rectangle clipping = new Rectangle((int) (vr.getX() * scaleFactor_),
+                (int) (vr.getY() * scaleFactor_), (int) (vr.getWidth() * scaleFactor_),
+                (int) (vr.getHeight() * scaleFactor_));
 
         if (OS.isMacintosh()) {
             Container parent = component_.getParent();
@@ -369,7 +376,11 @@ private void doUpdate() {
             }
         } else {
             synchronized (content_rect_) {
-                content_rect_ = component_.getBounds();
+                Rectangle bounds = component_.getBounds();
+                content_rect_ = new Rectangle((int) (bounds.getX() * scaleFactor_),
+                        (int) (bounds.getY() * scaleFactor_),
+                        (int) (bounds.getWidth() * scaleFactor_),
+                        (int) (bounds.getHeight() * scaleFactor_));
                 updateUI(clipping, content_rect_);
             }
         }