Make object equivalent of frame for dynamic filtering purpose

Related issue: - uBlockOrigin/uBlock-issues#2496
gorhill · Mar 31, 2023 · b4ae2d3 · b4ae2d3
1 parent 2c55bc3
commit b4ae2d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/js/dynamic-net-filtering.js b/src/js/dynamic-net-filtering.js
@@ -292,14 +292,13 @@ class DynamicHostRuleFiltering {
         this.y = '*';
 
         // Specific party
-        // TODO: equate `object` as `sub_frame`
         if ( thirdParty ) {
             // 3rd-party, specific type
             if ( type === 'script' ) {
                 if ( this.evaluateCellZ(srcHostname, '*', '3p-script') !== 0 ) {
                     return this.r;
                 }
-            } else if ( type === 'sub_frame' ) {
+            } else if ( type === 'sub_frame' || type === 'object' ) {
                 if ( this.evaluateCellZ(srcHostname, '*', '3p-frame') !== 0 ) {
                     return this.r;
                 }

diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js
@@ -286,6 +286,7 @@ const nodeFromURL = function(parent, url, re, type) {
             case 'css':
             case 'doc':
             case 'frame':
+            case 'object':
             case 'other':
             case 'script':
             case 'xhr':

diff --git a/src/logger-ui.html b/src/logger-ui.html
@@ -62,7 +62,7 @@
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span>
                                 <span style="flex-direction: column;">
                                     <div style="margin-bottom: 1px;"><span data-filtex="\t(?:css|(?:inline-)?font)\t">css/font</span><span data-filtex="\timage\t">image</span><span data-filtex="\tmedia\t">media</span><span data-filtex="\t(?:inline-)?script(?:ing)?\t">script</span></div>
-                                    <div><span data-filtex="\t(?:websocket|xhr)\t">xhr</span><span data-filtex="\tframe\t">frame</span><span data-filtex="\t(?:dom|g(?:eneric)?hide|s(?:pecific)?hide)\t">dom</span><span data-filtex="\t(?:beacon|csp_report|doc|ping|popup|popunder|other)\t">other</span></div>
+                                    <div><span data-filtex="\t(?:websocket|xhr)\t">xhr</span><span data-filtex="\t(?:frame|object)\t">frame</span><span data-filtex="\t(?:dom|g(?:eneric)?hide|s(?:pecific)?hide)\t">dom</span><span data-filtex="\t(?:beacon|csp_report|doc|ping|popup|popunder|other)\t">other</span></div>
                                 </span>
                             </div>
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\t(?:0,)?1\t" data-i18n="loggerRowFiltererBuiltin1p"></span><span data-filtex="\t(?:3(?:,\d)?|0,3)\t" data-i18n="loggerRowFiltererBuiltin3p"></span></div>