Move to webCompat

Author: jonathanKingston

injected/src/features.js

@@ -46,9 +46,9 @@ export const platformSupport = {
     android: [...baseFeatures, 'webCompat', 'breakageReporting', 'duckPlayer', 'messageBridge'],
     'android-broker-protection': ['brokerProtection'],
     'android-autofill-password-import': ['autofillPasswordImport'],
-    windows: ['cookie', ...baseFeatures, 'windowsPermissionUsage', 'duckPlayer', 'brokerProtection', 'breakageReporting', 'messageBridge'],
+    windows: ['cookie', ...baseFeatures, 'windowsPermissionUsage', 'duckPlayer', 'brokerProtection', 'breakageReporting', 'messageBridge', 'webCompat'],
     firefox: ['cookie', ...baseFeatures, 'clickToLoad'],
     chrome: ['cookie', ...baseFeatures, 'clickToLoad'],
-    'chrome-mv3': ['cookie', ...baseFeatures, 'clickToLoad'],
+    'chrome-mv3': ['cookie', ...baseFeatures, 'clickToLoad', 'webCompat'],
     integration: [...baseFeatures, ...otherFeatures],
 };

injected/src/features/web-compat.js

@@ -1,7 +1,7 @@
 import ContentFeature from '../content-feature.js';
 // eslint-disable-next-line no-redeclare
 import { URL } from '../captured-globals.js';
-
+import { DDGProxy } from '../utils';
 /**
  * Fixes incorrect sizing value for outerHeight and outerWidth
  */
@@ -126,6 +126,9 @@ export class WebCompat extends ContentFeature {
         if (this.getFeatureSettingEnabled('modifyCookies')) {
             this.modifyCookies();
         }
+        if (this.getFeatureSettingEnabled('disableDeviceEnumeration') || this.getFeatureSettingEnabled('disableDeviceEnumerationFrames')) {
+            this.preventDeviceEnumeration();
+        }
     }
 
     /** Shim Web Share API in Android WebView */
@@ -753,6 +756,27 @@ export class WebCompat extends ContentFeature {
             this.forceViewportTag(viewportTag, newContent.join(', '));
         }
     }
+
+    preventDeviceEnumeration() {
+        if (!window.MediaDevices) {
+            return;
+        }
+        let disableDeviceEnumeration = false;
+        const isFrame = window.self !== window.top;
+        if (isFrame) {
+            disableDeviceEnumeration = this.getFeatureSettingEnabled('disableDeviceEnumerationFrames');
+        } else {
+            disableDeviceEnumeration = this.getFeatureSettingEnabled('disableDeviceEnumeration');
+        }
+        if (disableDeviceEnumeration) {
+            const enumerateDevicesProxy = new DDGProxy(this, MediaDevices.prototype, 'enumerateDevices', {
+                apply() {
+                    return Promise.resolve([]);
+                },
+            });
+            enumerateDevicesProxy.overload();
+        }
+    }
 }
 
 /** @typedef {{title?: string, url?: string, text?: string}} ShareRequestData */

injected/src/features/windows-permission-usage.js

@@ -350,21 +350,6 @@ export default class WindowsPermissionUsage extends ContentFeature {
                 },
             });
             getUserMediaProxy.overload();
-            let disableDeviceEnumeration = false;
-            const isFrame = window.self !== window.top;
-            if (isFrame) {
-                disableDeviceEnumeration = this.getFeatureSettingEnabled('disableDeviceEnumerationFrames');
-            } else {
-                disableDeviceEnumeration = this.getFeatureSettingEnabled('disableDeviceEnumeration');
-            }
-            if (disableDeviceEnumeration) {
-                const enumerateDevicesProxy = new DDGProxy(this, MediaDevices.prototype, 'enumerateDevices', {
-                    apply() {
-                        return Promise.resolve([]);
-                    },
-                });
-                enumerateDevicesProxy.overload();
-            }
         }
 
         function performAction(action, permission) {