From 43689ffd85ebfc0e7f0ca12482aa16684249fb9d Mon Sep 17 00:00:00 2001 From: Ponchale Date: Fri, 8 Nov 2024 04:22:43 -0500 Subject: [PATCH] Bug 1924167 - shim updates; a=dmeehan --- browser/extensions/webcompat/data/shims.js | 17 ----------- browser/extensions/webcompat/manifest.json | 3 +- browser/extensions/webcompat/moz.build | 1 - .../webcompat/shims/google-safeframe.html | 29 ------------------- .../assets/extensions/webcompat/data/shims.js | 17 ----------- .../webcompat/shims/google-safeframe.html | 29 ------------------- 6 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 browser/extensions/webcompat/shims/google-safeframe.html delete mode 100644 mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html diff --git a/browser/extensions/webcompat/data/shims.js b/browser/extensions/webcompat/data/shims.js index ac6f86ad849..781ed380f15 100644 --- 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 index 8d72b0f8e4e..5b42c6c2cac 100644 --- 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 index a07fbba282d..820fb460f02 100644 --- 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 deleted file mode 100644 index 34bc1d242f5..00000000000 --- a/browser/extensions/webcompat/shims/google-safeframe.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - SafeFrame Container - - - - diff --git a/mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js b/mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js index ac6f86ad849..781ed380f15 100644 --- a/mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js +++ b/mobile/android/android-components/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/mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html b/mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html deleted file mode 100644 index 34bc1d242f5..00000000000 --- a/mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - SafeFrame Container - - - -