nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1924167 - shim updates; a=dmeehan

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D228367
This commit is contained in:
Thomas Wisniewski 2024-11-07 22:37:41 +00:00
parent d4164793c6
commit b823dd5a90
7 changed files with 2 additions and 97 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

17
browser/extensions/webcompat/data/shims.js
View file

@ -467,23 +467,6 @@ const AVAILABLE_SHIMS = [
], ],
onlyIfBlockedByETP: true, 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", id: "GoogleTrends",
platform: "all", platform: "all",

3
browser/extensions/webcompat/manifest.json
View file

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

1
browser/extensions/webcompat/moz.build
View file

@ -154,7 +154,6 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
"shims/google-ima.js", "shims/google-ima.js",
"shims/google-page-ad.js", "shims/google-page-ad.js",
"shims/google-publisher-tags.js", "shims/google-publisher-tags.js",
"shims/google-safeframe.html",
"shims/history.js", "shims/history.js",
"shims/iam.js", "shims/iam.js",
"shims/iaspet.js", "shims/iaspet.js",

29
browser/extensions/webcompat/shims/google-safeframe.html
View file

@ -1,29 +0,0 @@
<!DOCTYPE html>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
Bug 1713691 - Shim Google SafeFrame
Some sites will break if they cannot load a Google SafeFrame. This
shim provides a stand-in for the frame to mitigate that breakage.
-->
<html>
<head>
<meta charset="UTF-8" />
<title>SafeFrame Container</title>
<script>
try {
const F = /^([^;]+);(\d+);([\s\S]*)$/.exec(window.name);
window.name = "";
const P = window.document;
P.open("text/html", "replace");
P.write(F[3].substr(0, +F[2]));
P.close();
} catch (e) {
console.error(e);
}
</script>
</head>
<body></body>
</html>

17
mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/data/shims.js
View file

@ -467,23 +467,6 @@ const AVAILABLE_SHIMS = [
], ],
onlyIfBlockedByETP: true, 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", id: "GoogleTrends",
platform: "all", platform: "all",

3
mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/manifest.json
View file

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

29
mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/shims/google-safeframe.html
View file

@ -1,29 +0,0 @@
<!DOCTYPE html>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
Bug 1713691 - Shim Google SafeFrame
Some sites will break if they cannot load a Google SafeFrame. This
shim provides a stand-in for the frame to mitigate that breakage.
-->
<html>
<head>
<meta charset="UTF-8" />
<title>SafeFrame Container</title>
<script>
try {
const F = /^([^;]+);(\d+);([\s\S]*)$/.exec(window.name);
window.name = "";
const P = window.document;
P.open("text/html", "replace");
P.write(F[3].substr(0, +F[2]));
P.close();
} catch (e) {
console.error(e);
}
</script>
</head>
<body></body>
</html>