mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 763388 - Remove enablePrivilege calls from IndexedDB and FileHandle tests. r=bent
This commit is contained in:
parent
7fc33de707
commit
1ac8eec4a0
@ -76,48 +76,18 @@ ExpectError.prototype = {
|
||||
|
||||
function addPermission(type, allow, url)
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
|
||||
let uri;
|
||||
if (url) {
|
||||
uri = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService)
|
||||
.newURI(url, null, null);
|
||||
if (!url) {
|
||||
url = window.document;
|
||||
}
|
||||
else {
|
||||
uri = SpecialPowers.getDocumentURIObject(window.document);
|
||||
}
|
||||
|
||||
let permission;
|
||||
if (allow) {
|
||||
permission = Components.interfaces.nsIPermissionManager.ALLOW_ACTION;
|
||||
}
|
||||
else {
|
||||
permission = Components.interfaces.nsIPermissionManager.DENY_ACTION;
|
||||
}
|
||||
|
||||
Components.classes["@mozilla.org/permissionmanager;1"]
|
||||
.getService(Components.interfaces.nsIPermissionManager)
|
||||
.add(uri, type, permission);
|
||||
SpecialPowers.addPermission(type, allow, url);
|
||||
}
|
||||
|
||||
function removePermission(permission, url)
|
||||
function removePermission(type, url)
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
|
||||
let uri;
|
||||
if (url) {
|
||||
uri = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService)
|
||||
.newURI(url, null, null);
|
||||
if (!url) {
|
||||
url = window.document;
|
||||
}
|
||||
else {
|
||||
uri = SpecialPowers.getDocumentURIObject(window.document);
|
||||
}
|
||||
|
||||
Components.classes["@mozilla.org/permissionmanager;1"]
|
||||
.getService(Components.interfaces.nsIPermissionManager)
|
||||
.remove(uri.host, permission);
|
||||
SpecialPowers.removePermission(type, url);
|
||||
}
|
||||
|
||||
function allowIndexedDB(url)
|
||||
|
@ -25,10 +25,10 @@
|
||||
|
||||
let lockedFile2;
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
let thread = Components.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService()
|
||||
.currentThread;
|
||||
let comp = SpecialPowers.wrap(Components);
|
||||
let thread = comp.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(comp.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
|
||||
let eventHasRun;
|
||||
|
||||
|
@ -44,14 +44,14 @@
|
||||
is(sawError, true, "Saw getMetadata() error");
|
||||
|
||||
// Make sure the success event isn't queued somehow.
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
var thread = Components.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(Components.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
let comp = SpecialPowers.wrap(Components);
|
||||
var thread = comp.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(comp.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
while (thread.hasPendingEvents()) {
|
||||
thread.processNextEvent(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
finishTest();
|
||||
yield;
|
||||
|
@ -3,7 +3,6 @@
|
||||
* http://creativecommons.org/publicdomain/zero/1.0/
|
||||
*/
|
||||
|
||||
var manager = null;
|
||||
var bufferCache = [];
|
||||
var utils = SpecialPowers.getDOMWindowUtils(window);
|
||||
|
||||
@ -171,12 +170,9 @@ function grabFileUsageAndContinueHandler(usage, fileUsage)
|
||||
|
||||
function getUsage(usageHandler)
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
|
||||
if (!manager) {
|
||||
manager = Components.classes["@mozilla.org/dom/indexeddb/manager;1"]
|
||||
.getService(Components.interfaces.nsIIndexedDatabaseManager);
|
||||
}
|
||||
let comp = SpecialPowers.wrap(Components);
|
||||
let idbManager = comp.classes["@mozilla.org/dom/indexeddb/manager;1"]
|
||||
.getService(comp.interfaces.nsIIndexedDatabaseManager);
|
||||
|
||||
let uri = SpecialPowers.getDocumentURIObject(window.document);
|
||||
let callback = {
|
||||
@ -185,7 +181,7 @@ function getUsage(usageHandler)
|
||||
}
|
||||
};
|
||||
|
||||
manager.getUsageForURI(uri, callback);
|
||||
idbManager.getUsageForURI(uri, callback);
|
||||
}
|
||||
|
||||
function getUsageSync()
|
||||
@ -196,10 +192,10 @@ function getUsageSync()
|
||||
usage = aUsage;
|
||||
});
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
let thread = Components.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(Components.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
let comp = SpecialPowers.wrap(Components);
|
||||
let thread = comp.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(comp.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
while (!usage) {
|
||||
thread.processNextEvent(true);
|
||||
}
|
||||
|
@ -62,8 +62,8 @@
|
||||
continue;
|
||||
}
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
isnot(result.mozFullPath, refResult.mozFullPath, "Different os files");
|
||||
isnot(SpecialPowers.getMozFullPath(result),
|
||||
SpecialPowers.getMozFullPath(refResult), "Different os files");
|
||||
}
|
||||
|
||||
for (let i = 1; i < databases.length; i++) {
|
||||
@ -86,8 +86,8 @@
|
||||
verifyBlob(result, refResult, 2);
|
||||
yield;
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
isnot(result.mozFullPath, refResult.mozFullPath, "Different os files");
|
||||
isnot(SpecialPowers.getMozFullPath(result),
|
||||
SpecialPowers.getMozFullPath(refResult), "Different os files");
|
||||
}
|
||||
|
||||
is(bufferCache.length, 2, "Correct length");
|
||||
|
@ -62,8 +62,8 @@
|
||||
continue;
|
||||
}
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
is(result.mozFullPath, refResult.mozFullPath, "The same os file");
|
||||
is(SpecialPowers.getMozFullPath(result),
|
||||
SpecialPowers.getMozFullPath(refResult), "The same os file");
|
||||
}
|
||||
|
||||
for (let i = 1; i < objectStoreInfo.length; i++) {
|
||||
@ -86,8 +86,8 @@
|
||||
verifyBlob(result, refResult, 1);
|
||||
yield;
|
||||
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
is(result.mozFullPath, refResult.mozFullPath, "The same os file");
|
||||
is(SpecialPowers.getMozFullPath(result),
|
||||
SpecialPowers.getMozFullPath(refResult), "The same os file");
|
||||
}
|
||||
|
||||
is(bufferCache.length, 2, "Correct length");
|
||||
|
@ -36,23 +36,23 @@ function testSteps()
|
||||
sawError = true;
|
||||
event.preventDefault();
|
||||
}
|
||||
|
||||
|
||||
transaction.abort();
|
||||
|
||||
|
||||
event = yield;
|
||||
|
||||
is(event.type, "abort", "Got abort event");
|
||||
is(sawError, true, "Saw get() error");
|
||||
if (this.window) {
|
||||
// Make sure the success event isn't queued somehow.
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
var thread = Components.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(Components.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
let comp = SpecialPowers.wrap(Components);
|
||||
let thread = comp.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(comp.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
while (thread.hasPendingEvents()) {
|
||||
thread.processNextEvent(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
finishTest();
|
||||
yield;
|
||||
|
@ -23,11 +23,10 @@ function testSteps()
|
||||
|
||||
let transaction2;
|
||||
|
||||
if (this.window)
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
let thread = Components.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService()
|
||||
.currentThread;
|
||||
let comp = this.window ? SpecialPowers.wrap(Components) : Components;
|
||||
let thread = comp.classes["@mozilla.org/thread-manager;1"]
|
||||
.getService(comp.interfaces.nsIThreadManager)
|
||||
.currentThread;
|
||||
|
||||
let eventHasRun;
|
||||
|
||||
|
@ -1122,5 +1122,9 @@ SpecialPowersAPI.prototype = {
|
||||
};
|
||||
|
||||
this._sendSyncMessage('SPPermissionManager', msg);
|
||||
},
|
||||
|
||||
getMozFullPath: function(file) {
|
||||
return file.mozFullPath;
|
||||
}
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user