Bug 1924167 - shim updates; a=dmeehan

goastian · Nov 8, 2024 · 43689ff · 43689ff
1 parent 92869ab
commit 43689ff
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 95 deletions.
diff --git a/browser/extensions/webcompat/data/shims.js b/browser/extensions/webcompat/data/shims.js
@@ -467,23 +467,6 @@ const AVAILABLE_SHIMS = [
     ],
     onlyIfBlockedByETP: true,
   },
-  {
-    id: "Google SafeFrame",
-    platform: "all",
-    name: "Google SafeFrame",
-    bug: "1713691",
-    matches: [
-      {
-        patterns: [
-          "*://tpc.googlesyndication.com/safeframe/*/html/container.html",
-          "*://*.safeframe.googlesyndication.com/safeframe/*/html/container.html",
-        ],
-        target: "google-safeframe.html",
-        types: ["sub_frame"],
-      },
-    ],
-    onlyIfBlockedByETP: true,
-  },
   {
     id: "GoogleTrends",
     platform: "all",

diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "133.2.0",
+  "version": "133.3.0",
   "browser_specific_settings": {
     "gecko": {
       "id": "webcompat@mozilla.org",
@@ -129,7 +129,6 @@
     "shims/google-ima.js",
     "shims/google-page-ad.js",
     "shims/google-publisher-tags.js",
-    "shims/google-safeframe.html",
     "shims/history.js",
     "shims/iam.js",
     "shims/iaspet.js",

diff --git a/browser/extensions/webcompat/moz.build b/browser/extensions/webcompat/moz.build
@@ -154,7 +154,6 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
     "shims/google-ima.js",
     "shims/google-page-ad.js",
     "shims/google-publisher-tags.js",
-    "shims/google-safeframe.html",
     "shims/history.js",
     "shims/iam.js",
     "shims/iaspet.js",

diff --git a/browser/extensions/webcompat/shims/google-safeframe.html b/browser/extensions/webcompat/shims/google-safeframe.html
diff --git a/...omponents/components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js b/...omponents/components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js
@@ -467,23 +467,6 @@ const AVAILABLE_SHIMS = [
     ],
     onlyIfBlockedByETP: true,
   },
-  {
-    id: "Google SafeFrame",
-    platform: "all",
-    name: "Google SafeFrame",
-    bug: "1713691",
-    matches: [
-      {
-        patterns: [
-          "*://tpc.googlesyndication.com/safeframe/*/html/container.html",
-          "*://*.safeframe.googlesyndication.com/safeframe/*/html/container.html",
-        ],
-        target: "google-safeframe.html",
-        types: ["sub_frame"],
-      },
-    ],
-    onlyIfBlockedByETP: true,
-  },
   {
     id: "GoogleTrends",
     platform: "all",

diff --git a/...onents/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html b/...onents/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html