wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 911573 - Enable and use specialpowers in jsreftest. r=terrence, bholley

Browse Source
This commit is contained in:
Masatoshi Kimura 2013-09-05 01:02:27 +09:00
parent f509dcbf07
commit a3c225f686
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/src/tests/browser.js
View File

@ -156,8 +156,7 @@ function gc()
{
try
{
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
Components.utils.forceGC();
SpecialPowers.forceGC();
}
catch(ex)
{
@ -169,10 +168,8 @@ function jsdgc()
{
try
{
// Thanks to dveditz
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
var jsdIDebuggerService = Components.interfaces.jsdIDebuggerService;
var service = Components.classes['@mozilla.org/js/jsd/debugger-service;1'].
var jsdIDebuggerService = SpecialPowers.Ci.jsdIDebuggerService;
var service = SpecialPowers.Cc['@mozilla.org/js/jsd/debugger-service;1'].
getService(jsdIDebuggerService);
service.GC();
}
@ -202,9 +199,7 @@ function options(aOptionName)
}
if (aOptionName) {
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
if (!(aOptionName in Components.utils)) {
// if (!(aOptionName in SpecialPowers.wrap(Components).utils)) {
if (!(aOptionName in SpecialPowers.Cu)) {
// This test is trying to flip an unsupported option, so it's
// likely no longer testing what it was supposed to. Fail it
// hard.
@ -218,8 +213,7 @@ function options(aOptionName)
// option is not set, toggle it to set
options.currvalues[aOptionName] = true;
// SpecialPowers.wrap(Components).utils[aOptionName] = options.currvalues.hasOwnProperty(aOptionName);
Components.utils[aOptionName] =
SpecialPowers.Cu[aOptionName] =
options.currvalues.hasOwnProperty(aOptionName);
}
@ -248,18 +242,15 @@ function optionsInit() {
// and popping options
options.stackvalues = [];
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
for (var optionName in options.currvalues)
{
var propName = optionName;
// if (!(propName in SpecialPowers.wrap(Components).utils))
if (!(propName in Components.utils))
if (!(propName in SpecialPowers.Cu))
{
throw "options.currvalues is out of sync with Components.utils";
}
// if (!SpecialPowers.wrap(Components).utils[propName])
if (!Components.utils[propName])
if (!SpecialPowers.Cu[propName])
{
delete options.currvalues[optionName];
}
@ -272,8 +263,7 @@ function optionsInit() {
function gczeal(z)
{
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
Components.utils.setGCZeal(z);
SpecialPowers.setGCZeal(z);
}
function jit(on)
@ -513,11 +503,9 @@ var gDialogCloserObserver;
function registerDialogCloser()
{
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
// gDialogCloser = SpecialPowers.wrap(Components).
gDialogCloser = Components.
classes['@mozilla.org/embedcomp/window-watcher;1'].
getService(Components.interfaces.nsIWindowWatcher);
gDialogCloser = SpecialPowers.
Cc['@mozilla.org/embedcomp/window-watcher;1'].
getService(SpecialPowers.Ci.nsIWindowWatcher);
gDialogCloserObserver = {observe: dialogCloser_observe};

2
layout/tools/reftest/runreftest.py
View File

@ -87,7 +87,7 @@ class RefTest(object):
# I would prefer to use "--install-extension reftest/specialpowers", but that requires tight coordination with
# release engineering and landing on multiple branches at once.
if special_powers and manifest.endswith('crashtests.list'):
if special_powers and (manifest.endswith('crashtests.list') or manifest.endswith('jstests.list')):
addons.append(os.path.join(SCRIPT_DIRECTORY, 'specialpowers'))
# Install distributed extensions, if application has any.