Bug 1675349: Remove unused files following removing plugin support r=jmathies,extension-reviewers,geckoview-reviewers,agi,mixedpuppy

Remove some support files for plugin features and stop building TestPlugins.

Differential Revision: https://phabricator.services.mozilla.com/D95904
This commit is contained in:
David Parks 2020-11-18 15:56:10 +00:00
Родитель 3ad73d34d7
Коммит e5b505e41d
17 изменённых файлов: 0 добавлений и 497 удалений

Просмотреть файл

@ -24,7 +24,6 @@ def test(mod, path, entity=None):
"chrome/global/commonDialogs.properties",
"chrome/global/intl.properties",
"chrome/global/intl.css",
"chrome/pluginproblem/pluginproblem.dtd",
"chrome/global/aboutWebrtc.properties",
):
return "error"

Просмотреть файл

@ -28,8 +28,6 @@ relativesrcdir toolkit/locales:
locale/@AB_CD@/browser/overrides/commonDialogs.properties (%chrome/global/commonDialogs.properties)
locale/@AB_CD@/browser/overrides/intl.properties (%chrome/global/intl.properties)
locale/@AB_CD@/browser/overrides/intl.css (%chrome/global/intl.css)
# plugins
locale/@AB_CD@/browser/overrides/plugins/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd)
#about:webrtc
locale/@AB_CD@/browser/overrides/global/aboutWebrtc.properties (%chrome/global/aboutWebrtc.properties)

Просмотреть файл

@ -200,10 +200,6 @@ exclude-multi-locale = [
reference = "toolkit/locales/en-US/chrome/global/intl.css"
l10n = "{l}toolkit/chrome/global/intl.css"
[[paths]]
reference = "toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd"
l10n = "{l}toolkit/chrome/pluginproblem/pluginproblem.dtd"
[[paths]]
reference = "toolkit/locales/en-US/chrome/global/aboutSupport.dtd"
l10n = "{l}toolkit/chrome/global/aboutSupport.dtd"

Просмотреть файл

@ -24,7 +24,6 @@ def test(mod, path, entity=None):
"chrome/global/commonDialogs.properties",
"chrome/global/intl.properties",
"chrome/global/intl.css",
"chrome/pluginproblem/pluginproblem.dtd",
"chrome/global/aboutWebrtc.properties",
):
return "error"

Просмотреть файл

@ -52,22 +52,6 @@ TEST_HARNESS_BINS = [
TEST_HARNESS_DLLS = ["crashinjectdll", "mozglue"]
TEST_PLUGIN_DLLS = [
"npsecondtest",
"npswftest",
"nptest",
"nptestjava",
"npthirdtest",
]
TEST_PLUGIN_DIRS = [
"JavaTest.plugin/**",
"SecondTest.plugin/**",
"Test.plugin/**",
"ThirdTest.plugin/**",
"npswftest.plugin/**",
]
GMP_TEST_PLUGIN_DIRS = [
"gmp-clearkey/**",
"gmp-fake/**",
@ -238,26 +222,6 @@ ARCHIVE_FILES = {
],
"dest": "bin",
},
{
"source": buildconfig.topobjdir,
"base": "dist/plugins",
"patterns": [
"%s%s%s"
% (
buildconfig.substs["DLL_PREFIX"],
f,
buildconfig.substs["DLL_SUFFIX"],
)
for f in TEST_PLUGIN_DLLS
],
"dest": "bin/plugins",
},
{
"source": buildconfig.topobjdir,
"base": "dist/plugins",
"patterns": TEST_PLUGIN_DIRS,
"dest": "bin/plugins",
},
{
"source": buildconfig.topobjdir,
"base": "dist/bin",

Просмотреть файл

@ -1,32 +0,0 @@
<!-- 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/. -->
<!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
<!ENTITY tapToPlayPlugin "Tap here to activate plugin.">
<!ENTITY clickToActivatePlugin "Activate plugin.">
<!ENTITY checkForUpdates "Check for updates…">
<!ENTITY blockedPlugin.label "This plugin has been blocked for your protection.">
<!ENTITY hidePluginBtn.label "Hide plugin">
<!ENTITY managePlugins "Manage plugins…">
<!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
<!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
<!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
<!ENTITY reloadPlugin.pre "">
<!ENTITY reloadPlugin.middle "Reload the page">
<!ENTITY reloadPlugin.post " to try again.">
<!-- LOCALIZATION NOTE (report.please): This and the other report.* strings should be as short as possible, ideally 2-3 words. -->
<!ENTITY report.please "Send crash report">
<!ENTITY report.submitting "Sending report…">
<!ENTITY report.submitted "Crash report sent.">
<!ENTITY report.disabled "Crash reporting disabled.">
<!ENTITY report.failed "Submission failed.">
<!ENTITY report.unavailable "No report available.">
<!ENTITY report.comment "Add a comment (comments are publicly visible)">
<!ENTITY report.pageURL "Include the pages URL">
<!ENTITY plugin.file "File">
<!ENTITY plugin.mimeTypes "MIME Types">
<!ENTITY plugin.flashProtectedMode.label "Enable Adobe Flash protected mode">
<!ENTITY plugin.enableBlocklists.label "Block dangerous and intrusive Flash content">

Просмотреть файл

@ -64,7 +64,6 @@
locale/@AB_CD@/mozapps/downloads/unknownContentType.properties (%chrome/mozapps/downloads/unknownContentType.properties)
locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd (%chrome/mozapps/downloads/unknownContentType.dtd)
locale/@AB_CD@/mozapps/downloads/downloads.properties (%chrome/mozapps/downloads/downloads.properties)
locale/@AB_CD@/mozapps/extensions/extensions.dtd (%chrome/mozapps/extensions/extensions.dtd)
#ifndef MOZ_FENNEC
locale/@AB_CD@/mozapps/extensions/extensions.properties (%chrome/mozapps/extensions/extensions.properties)
#endif
@ -72,8 +71,6 @@
#ifndef MOZ_FENNEC
locale/@AB_CD@/mozapps/update/updates.properties (%chrome/mozapps/update/updates.properties)
#endif
% locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
locale/@AB_CD@/pluginproblem/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd)
% locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
locale/@AB_CD@/alerts/alert.dtd (%chrome/alerts/alert.dtd)
locale/@AB_CD@/alerts/alert.properties (%chrome/alerts/alert.properties)

Просмотреть файл

@ -1,78 +0,0 @@
/* 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/. */
"use strict";
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
const PREFS = {
pluginFlashBlockingCheckbox: {
pref: "plugins.flashBlock.enabled",
invert: false,
},
pluginEnableProtectedModeCheckbox: {
pref: "dom.ipc.plugins.flash.disable-protected-mode",
invert: true,
},
};
async function renderPluginMetadata(id) {
let plugin = await AddonManager.getAddonByID(id);
if (!plugin) {
return;
}
let libLabel = document.getElementById("pluginLibraries");
libLabel.textContent = plugin.pluginLibraries.join(", ");
let typeLabel = document.getElementById("pluginMimeTypes"),
types = [];
for (let type of plugin.pluginMimeTypes) {
let extras = [type.description.trim(), type.suffixes]
.filter(x => x)
.join(": ");
types.push(type.type + (extras ? " (" + extras + ")" : ""));
}
typeLabel.textContent = types.join(",\n");
let showProtectedModePref = canDisableFlashProtectedMode(plugin);
document.getElementById(
"pluginEnableProtectedMode"
).hidden = !showProtectedModePref;
// Disable flash blocking when Fission is enabled (See Bug 1584931).
document.getElementById(
"pluginFlashBlocking"
).hidden = canDisableFlashBlocking();
}
// Protected mode is win32-only, not win64
function canDisableFlashProtectedMode(aPlugin) {
return aPlugin.isFlashPlugin && Services.appinfo.XPCOMABI == "x86-msvc";
}
function canDisableFlashBlocking() {
return Services.appinfo.fissionAutostart;
}
function init() {
let params = new URLSearchParams(location.hash.slice(1));
renderPluginMetadata(params.get("id"));
for (let id of Object.keys(PREFS)) {
let checkbox = document.getElementById(id);
var prefVal = Services.prefs.getBoolPref(PREFS[id].pref);
checkbox.checked = PREFS[id].invert ? !prefVal : prefVal;
checkbox.addEventListener("change", () => {
Services.prefs.setBoolPref(
PREFS[id].pref,
PREFS[id].invert ? !checkbox.checked : checkbox.checked
);
});
}
}
window.addEventListener("load", init, { once: true });

Просмотреть файл

@ -1,72 +0,0 @@
<!-- 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/. -->
<!DOCTYPE html [
<!ENTITY % pluginsDTD SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
%pluginsDTD;
<!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
%extensionsDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<link rel="stylesheet" href="chrome://global/skin/global.css"/>
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css"/>
<style>
:root {
background-color: var(--in-content-box-background);
}
#detail-grid {
display: grid;
grid-template-columns: auto auto;
column-gap: 1em;
min-height: 250px;
align-content: start;
}
.detail-row:not([hidden]) {
display: grid;
grid-column: span 2;
grid-template-columns: subgrid;
padding-block: 16px;
line-height: 20px;
}
.detail-row:not([hidden]) ~ .detail-row {
border-top: 1px solid var(--in-content-box-border-color);
}
#pluginFlashBlocking label,
#pluginEnableProtectedMode label {
display: block;
}
</style>
<script src="chrome://mozapps/content/extensions/pluginPrefs.js"></script>
</head>
<body id="detail-grid">
<div class="detail-row">
<label>&plugin.file;</label>
<label class="text-list" id="pluginLibraries"/>
</div>
<div class="detail-row">
<label>&plugin.mimeTypes;</label>
<label class="text-list" id="pluginMimeTypes"/>
</div>
<div id="pluginFlashBlocking" class="detail-row">
<div>
<label>&plugin.enableBlocklists.label;</label>
<a href="https://support.mozilla.org/kb/flash-blocklists" target="_blank">&setting.learnmore;</a>
</div>
<input type="checkbox" id="pluginFlashBlockingCheckbox"/>
</div>
<div id="pluginEnableProtectedMode" class="detail-row">
<div>
<label>&plugin.flashProtectedMode.label;</label>
<a href="https://support.mozilla.org/kb/flash-protected-mode-settings" target="_blank">&setting.learnmore;</a>
</div>
<input type="checkbox" id="pluginEnableProtectedModeCheckbox"/>
</div>
</body>
</html>

Просмотреть файл

@ -9,8 +9,6 @@ toolkit.jar:
content/mozapps/extensions/extensions.js (content/extensions.js)
content/mozapps/extensions/blocklist.xhtml (content/blocklist.xhtml)
content/mozapps/extensions/blocklist.js (content/blocklist.js)
content/mozapps/extensions/pluginPrefs.xhtml (content/pluginPrefs.xhtml)
content/mozapps/extensions/pluginPrefs.js (content/pluginPrefs.js)
content/mozapps/extensions/OpenH264-license.txt (content/OpenH264-license.txt)
content/mozapps/extensions/aboutaddons.html (content/aboutaddons.html)
content/mozapps/extensions/aboutaddons.js (content/aboutaddons.js)

Просмотреть файл

@ -45,4 +45,3 @@ toolkit.jar:
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/plugins/pluginHelp-16.png (plugins/pluginHelp-16.png)

Просмотреть файл

@ -119,10 +119,6 @@ toolkit.jar:
#endif
skin/classic/global/plugins/plugin.svg (../../shared/plugins/plugin.svg)
skin/classic/global/plugins/plugin-blocked.svg (../../shared/plugins/plugin-blocked.svg)
skin/classic/global/plugins/pluginProblem.css (../../shared/plugins/pluginProblem.css)
skin/classic/global/plugins/contentPluginBlocked.png (../../shared/plugins/contentPluginBlocked.png)
skin/classic/global/plugins/contentPluginCrashed.png (../../shared/plugins/contentPluginCrashed.png)
skin/classic/global/plugins/contentPluginStripe.png (../../shared/plugins/contentPluginStripe.png)
skin/classic/global/pictureinpicture/player.css (../../shared/pictureinpicture/player.css)
skin/classic/global/media/pictureinpicture.svg (../../shared/media/pictureinpicture.svg)
skin/classic/global/pictureinpicture/audio.svg (../../shared/pictureinpicture/audio.svg)

Просмотреть файл

@ -21,7 +21,6 @@
* skin/classic/global/dirListing/dirListing.css (../../windows/global/dirListing/dirListing.css)
skin/classic/global/icons/question-64.png (../../windows/global/icons/question-64.png)
skin/classic/global/icons/search-textbox.svg (../../windows/global/icons/search-textbox.svg)
skin/classic/global/plugins/pluginHelp-16.png (../../windows/global/plugins/pluginHelp-16.png)
skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css)
skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/extensions/blocklist.css)

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 1.5 KiB

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 1.2 KiB

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 285 B

Просмотреть файл

@ -1,260 +0,0 @@
/* 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/. */
@namespace html url(http://www.w3.org/1999/xhtml);
/* These styles affect only the bound element, not other page content. */
.mainBox {
--grey-10: #f9f9fa;
--grey-60: #4a4a4f;
--grey-70: #38383d;
}
.mainBox {
font: message-box;
font-size: 12px;
text-align: center;
display: table;
width: 100%;
height: 100%;
background-color: rgb(72,72,72);
color: white;
user-select: none;
}
.hoverBox {
display: table-cell;
box-sizing: border-box;
padding: 5px;
vertical-align: middle;
width: 100%;
height: 100%;
}
:host(:-moz-handler-vulnerable-updatable) .hoverBox:active,
:host(:-moz-handler-vulnerable-no-update) .hoverBox:active {
background-color: rgb(65, 65, 65);
}
:host(:-moz-handler-vulnerable-updatable) .hoverBox:active .msgClickToPlay,
:host(:-moz-handler-vulnerable-no-update) .hoverBox:active .msgClickToPlay {
color: red;
}
:host(:-moz-handler-vulnerable-updatable) .hoverBox,
:host(:-moz-handler-vulnerable-no-update) .hoverBox,
:host(:-moz-handler-blocked) .hoverBox,
:host(:-moz-handler-crashed) .hoverBox {
background-image: url(chrome://global/skin/plugins/contentPluginStripe.png);
}
html|a {
color: white;
}
.icon {
width: 48px;
height: 48px;
background-position: center;
background-repeat: no-repeat;
background-size: contain;
border: none;
background-color: transparent;
-moz-user-focus: ignore;
margin-bottom: 6px;
-moz-context-properties: fill;
}
:host(:-moz-handler-vulnerable-updatable) .icon,
:host(:-moz-handler-vulnerable-no-update) .icon {
background-image: url(chrome://global/skin/plugins/contentPluginBlocked.png);
-moz-user-focus: normal;
}
:host(:-moz-handler-blocked) .icon {
background-image: url(chrome://global/skin/plugins/contentPluginBlocked.png);
}
:host(:-moz-handler-clicktoplay) .icon {
background-image: url(chrome://global/skin/plugins/plugin.svg);
fill: var(--grey-10);
-moz-user-focus: normal;
}
:host(:-moz-handler-crashed) .icon {
background-image: url(chrome://global/skin/plugins/contentPluginCrashed.png);
}
.throbber {
padding-left: 16px; /* width of the background image */
background: url(chrome://global/skin/icons/loading.png) no-repeat;
margin-left: 5px;
}
@media (min-resolution: 1.1dppx) {
.throbber {
background-image: url(chrome://global/skin/icons/loading@2x.png);
background-size: 16px;
}
}
/* on desktop, don't ever show the tap-to-play UI: that is for mobile only */
:host(:-moz-handler-clicktoplay) .msgTapToPlay {
display: none;
}
.submitStatus div {
min-height: 19px; /* height of biggest line (with throbber) */
}
.submitComment {
width: 340px;
height: 70px;
padding: 5px;
border: none;
border-radius: 5px;
resize: none;
font-family: inherit;
font-size: inherit;
}
.submitURLOptInBox {
text-align: start;
}
.submitURLOptIn {
margin-left: -1px;
}
.mainBox[chromedir="rtl"] .submitURLOptIn {
margin-left: 0;
margin-right: -1px;
}
.submitButtonBox {
margin-top: 7px;
}
.submitButton {
float: right;
}
.mainBox[chromedir="rtl"] .submitButton {
float: left;
}
.helpIcon {
display: inline-block;
min-width: 16px;
min-height: 16px;
background: url(chrome://global/skin/plugins/pluginHelp-16.png) no-repeat;
cursor: pointer;
float: left;
}
.mainBox[chromedir="rtl"] .helpIcon {
float: right;
}
.closeIcon {
display: block;
width: 20px;
height: 20px;
margin-top: 4px;
margin-inline: -24px 4px;
border: none;
border-radius: 2px;
background-color: transparent;
background-image: url(chrome://global/skin/icons/close.svg);
background-repeat: no-repeat;
-moz-context-properties: fill, fill-opacity;
fill-opacity: 0;
fill: var(--grey-10);
}
.closeIcon:hover {
fill-opacity: .1;
}
.closeIcon:hover:active {
fill-opacity: .2;
}
.action-link {
display: inline-block;
border-radius: 10px;
background-color: rgb(35, 35, 35);
padding: 2px 8px;
margin-top: 7px;
text-decoration: none;
}
.action-link:active {
background-color: rgb(20, 20, 20);
}
:host(:-moz-handler-vulnerable-updatable) .action-link {
background-color: #a81b0c;
}
:host(:-moz-handler-vulnerable-updatable) .action-link:active {
background-color: #801409;
}
/* New Photon styling
*
* At the moment, these rules are written to only override
* :-moz-handler-clicktoplay styling. Once we finish the
* redesign for all cases, we can change the CSS directly
* above instead of writing these super-specific rules.
*/
:host(:-moz-handler-clicktoplay) .mainBox {
background-color: var(--grey-70);
}
:host(:-moz-handler-clicktoplay) .msgClickToPlay {
/* Triggers overflow event if the container is too small */
min-width: 240px;
font-size: 13px;
}
:host(:-moz-handler-clicktoplay) .mainBox[sizing=oversized] {
/* Triggers overflow event when there is a layout */
width: 101%;
}
:host(:-moz-handler-clicktoplay) .mainBox[sizing=blank] .hoverBox {
visibility: hidden;
}
:host(:-moz-handler-clicktoplay) .mainBox[sizing=tiny] .icon {
width: 16px;
height: 16px;
}
:host(:-moz-handler-clicktoplay) .mainBox[sizing=reduced] .icon {
width: 32px;
height: 32px;
}
:host(:-moz-handler-clicktoplay) .mainBox[sizing=blank] .closeIcon,
:host(:-moz-handler-clicktoplay) .mainBox[sizing=tiny] .closeIcon,
:host(:-moz-handler-clicktoplay) .mainBox[sizing=reduced] .closeIcon {
display: none;
}
:host(:-moz-handler-clicktoplay) .mainBox[notext] .msgClickToPlay {
display: none;
}
:host(:-moz-handler-clicktoplay) .mainBox[notext] .icon {
/* Override a `margin-bottom: 6px` now that .msgClickToPlay
* below the icon is no longer shown, in order to achieve
* a perfect vertical centering of the icon.
*/
margin-bottom: 0;
}
:host(:-moz-handler-clicktoplay) .hoverBox:active {
background-color: var(--grey-60);
}