#227 disable offscreen with webkit

but keep it enabled with chrome
Xpra-org · Nov 27, 2023 · 32611a7 · 32611a7
1 parent 0fefac2
commit 32611a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/html5/connect.html b/html5/connect.html
@@ -23,13 +23,13 @@
 
     <script type="text/javascript" src="js/RgbHelpers.js"></script>
     <script type="text/javascript" src="js/VideoDecoder.js"></script>
+    <script src="js/Utilities.js"></script>
     <script
       type="text/javascript"
       src="js/OffscreenDecodeWorkerHelper.js"
     ></script>
 
     <script src="js/lib/jquery.js"></script>
-    <script src="js/Utilities.js"></script>
     <script src="js/MediaSourceUtil.js"></script>
     <script src="js/lib/aurora/aurora.js"></script>
     <!--

diff --git a/html5/js/OffscreenDecodeWorkerHelper.js b/html5/js/OffscreenDecodeWorkerHelper.js
@@ -34,20 +34,23 @@ const XpraOffscreenWorker = {
   },
 
   isAvailable() {
-    var isSafari = navigator.userAgent.toLowerCase().includes("safari");
-    if (isSafari && !this.isSafariVersionSupported()) {
+    if (Utilities.isSafari() && !this.isSafariVersionSupported()) {
       return false;
     }
 
-    var isFirefox = navigator.userAgent.toLowerCase().includes("firefox");
-    if (isFirefox && this.isFirefoxVersionSupported()) {
+    if (Utilities.isWebkit() && !Utilities.isChrome()) {
+      return false;
+    }
+
+    if (Utilities.isFirefox() && this.isFirefoxVersionSupported()) {
       return false;
     }
 
     if (typeof OffscreenCanvas !== "undefined") {
       //we also need the direct constructor:
       try {
         new OffscreenCanvas(256, 256);
+        console.log("offscreen canvas is available with", navigator.userAgent);
         return true;
       } catch (error) {
         console.warn("unable to instantiate an offscreen canvas:", error);

diff --git a/html5/js/Utilities.js b/html5/js/Utilities.js
@@ -224,6 +224,10 @@ const Utilities = {
     const ua = navigator.userAgent.toLowerCase();
     return ua.includes("safari") && !ua.includes("chrome");
   },
+  isWebkit() {
+    const ua = navigator.userAgent.toLowerCase();
+    return ua.includes("webkit");
+  },
   isEdge() {
     return navigator.userAgent.includes("Edge");
   },