зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1591102 - Let some SpecialPowers.pushPermissions callers use promises r=jdm
Some callers of SpecialPowers.pushPermissions wrapped the call in a promise. That is not needed; directly use the returned promise instead. Differential Revision: https://phabricator.services.mozilla.com/D50487 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
20949d82c8
Коммит
34c77beb98
|
@ -1,16 +1,11 @@
|
||||||
async function addNotificationPermission(originString) {
|
async function addNotificationPermission(originString) {
|
||||||
return new Promise(resolve => {
|
return SpecialPowers.pushPermissions([
|
||||||
SpecialPowers.pushPermissions(
|
{
|
||||||
[
|
type: "desktop-notification",
|
||||||
{
|
allow: true,
|
||||||
type: "desktop-notification",
|
context: originString,
|
||||||
allow: true,
|
},
|
||||||
context: originString,
|
]);
|
||||||
},
|
|
||||||
],
|
|
||||||
resolve
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -13,10 +13,8 @@ let registration;
|
||||||
let subscription;
|
let subscription;
|
||||||
|
|
||||||
const registerServiceWorker = async function() {
|
const registerServiceWorker = async function() {
|
||||||
await new Promise(resolve => {
|
const perm = { type: "desktop-notification", allow: true, context: document };
|
||||||
const perm = { type: "desktop-notification", allow: true, context: document };
|
await SpecialPowers.pushPermissions([perm]);
|
||||||
SpecialPowers.pushPermissions([perm], resolve);
|
|
||||||
});
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
registration = await navigator.serviceWorker.register("push-sw.js");
|
registration = await navigator.serviceWorker.register("push-sw.js");
|
||||||
|
|
|
@ -31,16 +31,11 @@ function log(msg) {
|
||||||
const autoplayPermission = "autoplay-media";
|
const autoplayPermission = "autoplay-media";
|
||||||
|
|
||||||
async function pushAutoplayAllowedPermission() {
|
async function pushAutoplayAllowedPermission() {
|
||||||
return new Promise((resolve, reject) => {
|
return SpecialPowers.pushPermissions([
|
||||||
SpecialPowers.pushPermissions(
|
{
|
||||||
[
|
type: autoplayPermission,
|
||||||
{
|
allow: true,
|
||||||
type: autoplayPermission,
|
context: document,
|
||||||
allow: true,
|
},
|
||||||
context: document,
|
]);
|
||||||
},
|
|
||||||
],
|
|
||||||
resolve
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,9 +43,7 @@
|
||||||
async function run() {
|
async function run() {
|
||||||
ok(await SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Shockwave Flash"), "Should find allowed test flash plugin");
|
ok(await SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Shockwave Flash"), "Should find allowed test flash plugin");
|
||||||
ok(!await SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Third Test Plug-in"), "Should not find disallowed plugin");
|
ok(!await SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Third Test Plug-in"), "Should not find disallowed plugin");
|
||||||
await new Promise(resolve => {
|
await SpecialPowers.pushPermissions([{type: "plugin:flash", allow: true, context: document}]);
|
||||||
SpecialPowers.pushPermissions([{type: "plugin:flash", allow: true, context: document}], resolve);
|
|
||||||
});
|
|
||||||
|
|
||||||
createNode("plugin-flash", "application/x-shockwave-flash-test");
|
createNode("plugin-flash", "application/x-shockwave-flash-test");
|
||||||
createNode("disallowedPlugin", "application/x-third-test");
|
createNode("disallowedPlugin", "application/x-third-test");
|
||||||
|
|
|
@ -172,12 +172,9 @@ SimpleTest.registerCleanupFunction(async function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
function setPushPermission(allow) {
|
function setPushPermission(allow) {
|
||||||
return new Promise(resolve => {
|
return SpecialPowers.pushPermissions([
|
||||||
SpecialPowers.pushPermissions(
|
{ type: "desktop-notification", allow, context: document },
|
||||||
[{ type: "desktop-notification", allow, context: document }],
|
]);
|
||||||
resolve
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function setupPrefs() {
|
function setupPrefs() {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче