зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1713693 - Add a SmartBlock shim for Doubleclick; r=denschub,webcompat-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D119099
This commit is contained in:
Родитель
e747f2cebc
Коммит
b2fc60f6f5
|
@ -134,6 +134,47 @@ const AVAILABLE_SHIMS = [
|
||||||
matches: ["*://auth.9c9media.ca/auth/main.js"],
|
matches: ["*://auth.9c9media.ca/auth/main.js"],
|
||||||
onlyIfBlockedByETP: true,
|
onlyIfBlockedByETP: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: "Doubleclick",
|
||||||
|
platform: "all",
|
||||||
|
name: "Doubleclick",
|
||||||
|
bug: "1713693",
|
||||||
|
matches: [
|
||||||
|
{
|
||||||
|
patterns: [
|
||||||
|
"*://securepubads.g.doubleclick.net/gampad/*ad-blk*",
|
||||||
|
"*://pubads.g.doubleclick.net/gampad/*ad-blk*",
|
||||||
|
],
|
||||||
|
target: "empty-shim.txt",
|
||||||
|
types: ["image", "imageset", "xmlhttprequest"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
patterns: [
|
||||||
|
"*://securepubads.g.doubleclick.net/gampad/*xml_vmap1*",
|
||||||
|
"*://pubads.g.doubleclick.net/gampad/*xml_vmap1*",
|
||||||
|
],
|
||||||
|
target: "vmad.xml",
|
||||||
|
types: ["image", "imageset", "xmlhttprequest"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
patterns: [
|
||||||
|
"*://securepubads.g.doubleclick.net/gampad/*xml_vmap2*",
|
||||||
|
"*://pubads.g.doubleclick.net/gampad/*xml_vmap2*",
|
||||||
|
],
|
||||||
|
target: "vast2.xml",
|
||||||
|
types: ["image", "imageset", "xmlhttprequest"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
patterns: [
|
||||||
|
"*://securepubads.g.doubleclick.net/gampad/*ad*",
|
||||||
|
"*://pubads.g.doubleclick.net/gampad/*ad*",
|
||||||
|
],
|
||||||
|
target: "vast3.xml",
|
||||||
|
types: ["image", "imageset", "xmlhttprequest"],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
onlyIfBlockedByETP: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: "Eluminate",
|
id: "Eluminate",
|
||||||
platform: "all",
|
platform: "all",
|
||||||
|
|
|
@ -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": "23.6.0",
|
"version": "23.7.0",
|
||||||
|
|
||||||
"applications": {
|
"applications": {
|
||||||
"gecko": {
|
"gecko": {
|
||||||
|
@ -94,6 +94,7 @@
|
||||||
"shims/bmauth.js",
|
"shims/bmauth.js",
|
||||||
"shims/eluminate.js",
|
"shims/eluminate.js",
|
||||||
"shims/empty-script.js",
|
"shims/empty-script.js",
|
||||||
|
"shims/empty-shim.txt",
|
||||||
"shims/facebook-sdk.js",
|
"shims/facebook-sdk.js",
|
||||||
"shims/facebook.svg",
|
"shims/facebook.svg",
|
||||||
"shims/google-analytics-and-tag-manager.js",
|
"shims/google-analytics-and-tag-manager.js",
|
||||||
|
@ -107,6 +108,9 @@
|
||||||
"shims/play.svg",
|
"shims/play.svg",
|
||||||
"shims/rambler-authenticator.js",
|
"shims/rambler-authenticator.js",
|
||||||
"shims/rich-relevance.js",
|
"shims/rich-relevance.js",
|
||||||
"shims/tracking-pixel.png"
|
"shims/tracking-pixel.png",
|
||||||
|
"shims/vast2.xml",
|
||||||
|
"shims/vast3.xml",
|
||||||
|
"shims/vmad.xml"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,6 +81,7 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
|
||||||
"shims/bmauth.js",
|
"shims/bmauth.js",
|
||||||
"shims/eluminate.js",
|
"shims/eluminate.js",
|
||||||
"shims/empty-script.js",
|
"shims/empty-script.js",
|
||||||
|
"shims/empty-shim.txt",
|
||||||
"shims/facebook-sdk.js",
|
"shims/facebook-sdk.js",
|
||||||
"shims/facebook.svg",
|
"shims/facebook.svg",
|
||||||
"shims/google-analytics-and-tag-manager.js",
|
"shims/google-analytics-and-tag-manager.js",
|
||||||
|
@ -95,6 +96,9 @@ FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["shims"] += [
|
||||||
"shims/rambler-authenticator.js",
|
"shims/rambler-authenticator.js",
|
||||||
"shims/rich-relevance.js",
|
"shims/rich-relevance.js",
|
||||||
"shims/tracking-pixel.png",
|
"shims/tracking-pixel.png",
|
||||||
|
"shims/vast2.xml",
|
||||||
|
"shims/vast3.xml",
|
||||||
|
"shims/vmad.xml",
|
||||||
]
|
]
|
||||||
|
|
||||||
FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["lib"] += [
|
FINAL_TARGET_FILES.features["webcompat@mozilla.org"]["lib"] += [
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- 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 1713693 - Shim Doubleclick
|
||||||
|
|
||||||
|
Some sites rely on an XML VAST Ad response from Doubleclick, or will
|
||||||
|
break (showing black boxes instead of videos, etc). This shim mitigates
|
||||||
|
such breakage.
|
||||||
|
-->
|
||||||
|
<VAST version="2.0"></VAST>
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- 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 1713693 - Shim Doubleclick
|
||||||
|
|
||||||
|
Some sites rely on an XML VAST Ad response from Doubleclick, or will
|
||||||
|
break (showing black boxes instead of videos, etc). This shim mitigates
|
||||||
|
such breakage.
|
||||||
|
-->
|
||||||
|
<VAST version="3.0"></VAST>
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- 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 1713693 - Shim Doubleclick
|
||||||
|
|
||||||
|
Some sites rely on an XML VMAD Ad response from Doubleclick, or will
|
||||||
|
break (showing black boxes instead of videos, etc). This shim mitigates
|
||||||
|
such breakage.
|
||||||
|
-->
|
||||||
|
<vmap:AdBreak></vmap:AdBreak>
|
|
@ -66,6 +66,12 @@ browser/defaults/settings/main/password-rules.json
|
||||||
browser/defaults/settings/main/search-default-override-allowlist.json
|
browser/defaults/settings/main/search-default-override-allowlist.json
|
||||||
browser/defaults/settings/main/url-classifier-skip-urls.json
|
browser/defaults/settings/main/url-classifier-skip-urls.json
|
||||||
|
|
||||||
|
# Bug 1713693 - empty-shim.txt, an intentionally blank file used by SmartBlock (0 bytes)
|
||||||
|
#ifdef MOZ_GTK
|
||||||
|
browser/features/webcompat@mozilla.org/shims/empty-shim.txt
|
||||||
|
removed-files
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef MOZ_EME_WIN32_ARTIFACT
|
#ifdef MOZ_EME_WIN32_ARTIFACT
|
||||||
gmp-clearkey/0.1/manifest.json
|
gmp-clearkey/0.1/manifest.json
|
||||||
i686/gmp-clearkey/0.1/manifest.json
|
i686/gmp-clearkey/0.1/manifest.json
|
||||||
|
|
Загрузка…
Ссылка в новой задаче