Fixed CI and tests

Author: shai-almog

.github/workflows/javase-cef-ffmpeg-smoke.yml

@@ -1,5 +1,8 @@
 name: JavaSE CEF/FFmpeg Smoke
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     paths:

Ports/JavaSE/src/com/codename1/impl/javase/cef/RequestHandler.java

@@ -9,9 +9,7 @@
 import org.cef.browser.CefBrowser;
 import org.cef.browser.CefFrame;
 import org.cef.callback.CefAuthCallback;
-import org.cef.callback.CefCallback;
-import org.cef.handler.CefLoadHandler.ErrorCode;
-import org.cef.handler.CefRequestHandler;
+import org.cef.handler.CefRequestHandlerAdapter;
 import org.cef.handler.CefResourceHandler;
 import org.cef.handler.CefResourceRequestHandler;
 import org.cef.handler.CefResourceRequestHandlerAdapter;
@@ -31,10 +29,21 @@
 //import tests.detailed.dialog.CertErrorDialog;
 //import tests.detailed.dialog.PasswordDialog;
 
-public class RequestHandler extends CefResourceRequestHandlerAdapter implements CefRequestHandler {
+public class RequestHandler extends CefRequestHandlerAdapter {
     private final WeakReference<Container> ownerRef;
     //private BrowserComponent browserComponent_;
     private final BrowserNavigationCallback navigationCallback_;
+    private final CefResourceRequestHandler resourceRequestHandler = new CefResourceRequestHandlerAdapter() {
+        @Override
+        public boolean onBeforeResourceLoad(CefBrowser browser, CefFrame frame, CefRequest request) {
+            return RequestHandler.this.onBeforeResourceLoadImpl(browser, frame, request);
+        }
+
+        @Override
+        public CefResourceHandler getResourceHandler(CefBrowser browser, CefFrame frame, CefRequest request) {
+            return RequestHandler.this.getResourceHandlerImpl(browser, frame, request);
+        }
+    };
 
 
     public RequestHandler(Container owner, BrowserNavigationCallback navigationCallback) {
@@ -85,20 +94,14 @@ public void run() {
         return false;
     }
 
-    @Override
-    public boolean onOpenURLFromTab(CefBrowser browser, CefFrame frame, String targetUrl, boolean userGesture) {
-        return false;
-    }
-
     @Override
     public CefResourceRequestHandler getResourceRequestHandler(CefBrowser browser, CefFrame frame,
             CefRequest request, boolean isNavigation, boolean isDownload, String requestInitiator,
             BoolRef disableDefaultHandling) {
-        return this;
+        return resourceRequestHandler;
     }
 
-    @Override
-    public boolean onBeforeResourceLoad(CefBrowser browser, CefFrame frame, CefRequest request) {
+    private boolean onBeforeResourceLoadImpl(CefBrowser browser, CefFrame frame, CefRequest request) {
         // If you send a HTTP-POST request to http://www.google.com/
         // google rejects your request because they don't allow HTTP-POST.
         //
@@ -149,8 +152,7 @@ else if (s.startsWith("sendAsGet")) {
         return false;
     }
 
-    @Override
-    public CefResourceHandler getResourceHandler(
+    private CefResourceHandler getResourceHandlerImpl(
             CefBrowser browser, CefFrame frame, CefRequest request) {
         // the non existing domain "foo.bar" is handled by the ResourceHandler implementation
         // E.g. if you try to load the URL http://www.foo.bar, you'll be forwarded
@@ -173,19 +175,6 @@ public boolean getAuthCredentials(CefBrowser browser, String origin_url, boolean
         return true;
     }
 
-    @Override
-    public boolean onQuotaRequest(
-            CefBrowser browser, String origin_url, long new_size, CefCallback callback) {
-        return false;
-    }
-
-    @Override
-    public boolean onCertificateError(CefBrowser browser, ErrorCode cert_error, String request_url,
-            CefCallback callback) {
-        //SwingUtilities.invokeLater(new CertErrorDialog(owner_, cert_error, request_url, callback));
-        return true;
-    }
-
     @Override
     public void onPluginCrashed(CefBrowser browser, String pluginPath) {
         System.out.println("Plugin " + pluginPath + "CRASHED");

Ports/JavaSE/src/com/codename1/impl/javase/ffmpeg/FFMPEGMedia.java

@@ -317,6 +317,15 @@ public void setVariable(String key, Object value) {
 
         @Override
         public Object getVariable(String key) {
+            if ("ffmpeg.videoFrameRendered".equals(key)) {
+                return Boolean.valueOf(videoPanel != null && videoPanel.hasFrame());
+            }
+            if ("ffmpeg.videoFrameCount".equals(key)) {
+                return Integer.valueOf(videoPanel != null ? videoPanel.getFrameCount() : 0);
+            }
+            if ("ffmpeg.videoAverageColor".equals(key)) {
+                return videoPanel != null ? videoPanel.getAverageColor() : "";
+            }
             return null;
         }
 
@@ -630,6 +639,7 @@ private static class ProbeData {
 
     private static class VideoPanel extends JPanel implements HierarchyListener {
         private volatile BufferedImage image;
+        private volatile int frameCount;
 
         VideoPanel(int width, int height) {
             setBackground(Color.BLACK);
@@ -652,9 +662,43 @@ void updateFrame(byte[] bytes, int width, int height) {
             }
             next.setRGB(0, 0, width, height, argb, 0, width);
             image = next;
+            frameCount++;
             repaint();
         }
 
+        boolean hasFrame() {
+            return image != null;
+        }
+
+        int getFrameCount() {
+            return frameCount;
+        }
+
+        String getAverageColor() {
+            BufferedImage current = image;
+            if (current == null) {
+                return "";
+            }
+            long r = 0;
+            long g = 0;
+            long b = 0;
+            int width = current.getWidth();
+            int height = current.getHeight();
+            int count = width * height;
+            if (count == 0) {
+                return "";
+            }
+            for (int y = 0; y < height; y++) {
+                for (int x = 0; x < width; x++) {
+                    int rgb = current.getRGB(x, y);
+                    r += (rgb >> 16) & 0xff;
+                    g += (rgb >> 8) & 0xff;
+                    b += rgb & 0xff;
+                }
+            }
+            return (r / count) + "," + (g / count) + "," + (b / count);
+        }
+
         @Override
         protected void paintComponent(Graphics g) {
             super.paintComponent(g);

Ports/JavaSE/src/org/cef/browser/CN1CefBrowser.java

@@ -30,6 +30,7 @@
 */
 import org.cef.CefClient;
 import org.cef.callback.CefDragData;
+import org.cef.handler.CefRenderHandlerAdapter;
 import org.cef.handler.CefRenderHandler;
 
 import java.awt.Component;
@@ -61,7 +62,7 @@
  * The visibility of this class is "package". To create a new
  * CefBrowser instance, please use CefBrowserFactory.
  */
-public class CN1CefBrowser extends CefBrowser_N implements CefRenderHandler {
+public class CN1CefBrowser extends CefBrowser_N {
     //private CefRenderer renderer_;
     //private GLCanvas canvas_;
     private long window_handle_ = 0;
@@ -72,6 +73,47 @@ public class CN1CefBrowser extends CefBrowser_N implements CefRenderHandler {
     //private BufferedImage bufferedImage_;
     private WeakReference<PixelBuffer> bufferRef;
     private byte[] buf_;
+    private final CefRenderHandler renderHandler_ = new CefRenderHandlerAdapter() {
+        @Override
+        public Rectangle getViewRect(CefBrowser browser) {
+            return CN1CefBrowser.this.getViewRectImpl(browser);
+        }
+
+        @Override
+        public boolean getScreenInfo(CefBrowser browser, CefScreenInfo screenInfo) {
+            return CN1CefBrowser.this.getScreenInfoImpl(browser, screenInfo);
+        }
+
+        @Override
+        public Point getScreenPoint(CefBrowser browser, Point viewPoint) {
+            return CN1CefBrowser.this.getScreenPointImpl(browser, viewPoint);
+        }
+
+        @Override
+        public void onPopupShow(CefBrowser browser, boolean show) {
+            CN1CefBrowser.this.onPopupShowImpl(browser, show);
+        }
+
+        @Override
+        public void onPopupSize(CefBrowser browser, Rectangle size) {
+            CN1CefBrowser.this.onPopupSizeImpl(browser, size);
+        }
+
+        @Override
+        public void onPaint(CefBrowser browser, boolean popup, Rectangle[] dirtyRects, ByteBuffer buffer, int width, int height) {
+            CN1CefBrowser.this.onPaintImpl(browser, popup, dirtyRects, buffer, width, height);
+        }
+
+        @Override
+        public boolean startDragging(CefBrowser browser, CefDragData dragData, int mask, int x, int y) {
+            return CN1CefBrowser.this.startDraggingImpl(browser, dragData, mask, x, y);
+        }
+
+        @Override
+        public void updateDragCursor(CefBrowser browser, int operation) {
+            CN1CefBrowser.this.updateDragCursorImpl(browser, operation);
+        }
+    };
 
 
     public CN1CefBrowser(CefClient client, String url, boolean transparent, CefRequestContext context) {
@@ -110,7 +152,7 @@ public Component getUIComponent() {
 
     @Override
     public CefRenderHandler getRenderHandler() {
-        return this;
+        return renderHandler_;
     }
 
     @Override
@@ -120,7 +162,6 @@ protected CefBrowser_N createDevToolsBrowser(CefClient client, String url,
                 client, url, isTransparent_, context, (CN1CefBrowser) this, inspectAt);
     }
 
-    @Override
     public CompletableFuture<BufferedImage> createScreenshot(boolean nativeResolution) {
         return CompletableFuture.completedFuture(null);
     }
@@ -365,13 +406,11 @@ public void setFocus(boolean enable) {
 
 
 
-    @Override
-    public Rectangle getViewRect(CefBrowser browser) {
+    public Rectangle getViewRectImpl(CefBrowser browser) {
         return browser_rect_;
     }
 
-    @Override
-    public Point getScreenPoint(CefBrowser browser, Point viewPoint) {
+    public Point getScreenPointImpl(CefBrowser browser, Point viewPoint) {
         try {
             Point screenPoint = new Point(screenPoint_);
             screenPoint.translate(viewPoint.x, viewPoint.y);
@@ -383,8 +422,7 @@ public Point getScreenPoint(CefBrowser browser, Point viewPoint) {
         }
     }
 
-    @Override
-    public void onPopupShow(CefBrowser browser, boolean show) {
+    public void onPopupShowImpl(CefBrowser browser, boolean show) {
         try {
             if (!show) {
                 //renderer_.clearPopupRects();
@@ -396,8 +434,7 @@ public void onPopupShow(CefBrowser browser, boolean show) {
         }
     }
 
-    @Override
-    public void onPopupSize(CefBrowser browser, Rectangle size) {
+    public void onPopupSizeImpl(CefBrowser browser, Rectangle size) {
         try {
             //renderer_.onPopupSize(size);
         } catch (Throwable t) {
@@ -408,16 +445,15 @@ public void onPopupSize(CefBrowser browser, Rectangle size) {
 
     private boolean firstPaint=true;
 
-    @Override
-    public void onPaint(final CefBrowser browser, final boolean popup, final Rectangle[] dirtyRects,
+    public void onPaintImpl(final CefBrowser browser, final boolean popup, final Rectangle[] dirtyRects,
             final ByteBuffer buffer, final int width, final int height) {
         try {
-            _onPaint(browser, popup, dirtyRects, buffer, width, height);
+            _onPaintImpl(browser, popup, dirtyRects, buffer, width, height);
         } catch (Throwable t) {
             t.printStackTrace();
         }
     }
-    public void _onPaint(final CefBrowser browser, final boolean popup, final Rectangle[] dirtyRects,
+    public void _onPaintImpl(final CefBrowser browser, final boolean popup, final Rectangle[] dirtyRects,
             final ByteBuffer buffer, final int width, final int height) {    
         final PixelBuffer buffer_ = bufferRef.get();
         if (buffer_ == null) {
@@ -494,24 +530,12 @@ public void run() {
         }
     }
 
-    @Override
-    public boolean onCursorChange(CefBrowser browser, final int cursorType) {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                component_.setCursor(new Cursor(cursorType));
-            }
-        });
-        return true;
-    }
-
-    @Override
-    public boolean startDragging(CefBrowser browser, CefDragData dragData, int mask, int x, int y) {
+    public boolean startDraggingImpl(CefBrowser browser, CefDragData dragData, int mask, int x, int y) {
         // TODO(JCEF) Prepared for DnD support using OSR mode.
         return false;
     }
 
-    @Override
-    public void updateDragCursor(CefBrowser browser, int operation) {
+    public void updateDragCursorImpl(CefBrowser browser, int operation) {
         // TODO(JCEF) Prepared for DnD support using OSR mode.
     }
 
@@ -550,8 +574,7 @@ public static void setComponentFactory(ComponentFactory factory) {
         componentFactory = factory;
     }
 
-    @Override
-    public boolean getScreenInfo(CefBrowser browser, CefScreenInfo screenInfo) {
+    public boolean getScreenInfoImpl(CefBrowser browser, CefScreenInfo screenInfo) {
         try {
             GraphicsDevice graphicsDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
             GraphicsConfiguration graphicsConfig = graphicsDevice.getDefaultConfiguration();

maven/codenameone-maven-plugin/src/main/java/com/codename1/maven/AbstractCN1Mojo.java

@@ -954,7 +954,7 @@ private void setExecutableRecursive(File root, Collection<String> patterns) {
     }
 
     private File extractCefBundle(File nativeJar) {
-        File extractedDir = new File(nativeJar.getParentFile(), nativeJar.getName() + "-extracted");
+        File extractedDir = new File(project.getBuild().getDirectory(), "cn1-cef-" + getCefPlatform());
         File cefRoot = new File(extractedDir, "cef");
         File runtimeDir = new File(cefRoot, getCefRuntimeSubdir());
         File tempExtract = new File(extractedDir, "tmp");