Conditional frame matching

Author: jonathanKingston

injected/src/config-feature.js

@@ -109,6 +109,9 @@ export default class ConfigFeature {
      * @property {object} [experiment]
      * @property {string} [experiment.experimentName]
      * @property {string} [experiment.cohort]
+     * @property {object} [context]
+     * @property {boolean} [context.frame] - true if the condition applies to frames
+     * @property {boolean} [context.top] - true if the condition applies to the top frame
      */
 
     /**
@@ -134,6 +137,7 @@ export default class ConfigFeature {
         /** @type {Record<string, (conditionBlock: ConditionBlock) => boolean>} */
         const conditionChecks = {
             domain: this._matchDomainConditional,
+            context: this._matchContextConditional,
             urlPattern: this._matchUrlPatternConditional,
             experiment: this._matchExperimentConditional,
         };
@@ -197,6 +201,23 @@ export default class ConfigFeature {
         });
     }
 
+    /**
+     * Takes a condition block and returns true if the current context matches the context.
+     * @param {ConditionBlock} conditionBlock
+     * @returns {boolean}
+     */
+    _matchContextConditional(conditionBlock) {
+        if (!conditionBlock.context) return false;
+        const isFrame = window.self !== window.top;
+        if (conditionBlock.context.frame && isFrame) {
+            return true;
+        }
+        if (conditionBlock.context.top && !isFrame) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Takes a condtion block and returns true if the current url matches the urlPattern.
      * @param {ConditionBlock} conditionBlock

injected/src/features.js

@@ -46,7 +46,16 @@ 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', 'webCompat'],
+    windows: [
+        'cookie',
+        ...baseFeatures,
+        'windowsPermissionUsage',
+        'duckPlayer',
+        'brokerProtection',
+        'breakageReporting',
+        'messageBridge',
+        'webCompat',
+    ],
     firefox: ['cookie', ...baseFeatures, 'clickToLoad'],
     chrome: ['cookie', ...baseFeatures, 'clickToLoad'],
     'chrome-mv3': ['cookie', ...baseFeatures, 'clickToLoad', 'webCompat'],

injected/src/features/web-compat.js

@@ -126,7 +126,7 @@ export class WebCompat extends ContentFeature {
         if (this.getFeatureSettingEnabled('modifyCookies')) {
             this.modifyCookies();
         }
-        if (this.getFeatureSettingEnabled('disableDeviceEnumeration') || this.getFeatureSettingEnabled('disableDeviceEnumerationFrames')) {
+        if (this.getFeatureSettingEnabled('disableDeviceEnumeration')) {
             this.preventDeviceEnumeration();
         }
     }
@@ -761,21 +761,12 @@ export class WebCompat extends ContentFeature {
         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();
-        }
+        const enumerateDevicesProxy = new DDGProxy(this, MediaDevices.prototype, 'enumerateDevices', {
+            apply() {
+                return Promise.resolve([]);
+            },
+        });
+        enumerateDevicesProxy.overload();
     }
 }