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 862353 - Only enable mozSettings in B2G and mochitests. r=gwagner

Browse Source 
--HG--
extra : rebase_source : 2b079aa6aca6a65516670cc5adcccf422b5e0261
This commit is contained in:
Reuben Morais 2013-05-13 18:32:09 -07:00
parent fd880080d4
commit 9fdab01a57
11 changed files with 20 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/app/b2g.js
View File

@ -417,6 +417,7 @@ pref("ril.lastKnownMcc", "724");
// WebSettings
pref("dom.mozSettings.enabled", true);
pref("dom.navigator-property.disable.mozSettings", false);
pref("dom.mozPermissionSettings.enabled", true);
// controls if we want camera support

5
dom/network/tests/marionette/test_mobile_preferred_network_type.js
View File

@ -5,10 +5,6 @@ MARIONETTE_TIMEOUT = 60000;
const KEY = "ril.radio.preferredNetworkType";
let gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
if (!gSettingsEnabled) {
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
}
SpecialPowers.addPermission("mobileconnection", true, document);
SpecialPowers.addPermission("settings-read", true, document);
SpecialPowers.addPermission("settings-write", true, document);
@ -59,7 +55,6 @@ function cleanUp() {
SpecialPowers.removePermission("mobileconnection", document);
SpecialPowers.removePermission("settings-write", document);
SpecialPowers.removePermission("settings-read", document);
SpecialPowers.clearUserPref("dom.mozSettings.enabled");
finish();
}

2
dom/settings/SettingsManager.manifest
View File

@ -1,6 +1,6 @@
component {c40b1c70-00fb-11e2-a21f-0800200c9a66} SettingsManager.js
contract @mozilla.org/settingsManager;1 {c40b1c70-00fb-11e2-a21f-0800200c9a66}
category JavaScript-navigator-property-maybe dom.mozSettings.enabled mozSettings,@mozilla.org/settingsManager;1
category JavaScript-navigator-property mozSettings @mozilla.org/settingsManager;1
component {60c9357c-3ae0-4222-8f55-da01428470d5} SettingsManager.js
contract @mozilla.org/settingsLock;1 {60c9357c-3ae0-4222-8f55-da01428470d5}

20
dom/settings/tests/test_settings_basics.html
View File

@ -21,9 +21,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
"use strict";
if (!SpecialPowers.getBoolPref("dom.mozSettings.enabled")) {
if (SpecialPowers.isMainProcess()) {
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
}
SpecialPowers.addPermission("settings-read", true, document);
@ -97,7 +96,7 @@ function check(o1, o2) {
var req, req2, req3, req4, req5, req6;
var index = 0;
var mozSettings;
var mozSettings = navigator.mozSettings;
var steps = [
function () {
@ -782,21 +781,8 @@ function next() {
index += 1;
}
function permissionTest() {
if (gSettingsEnabled) {
mozSettings = window.navigator.mozSettings;
next();
} else {
is(mozSettings, null, "mozSettings is null when not enabled.");
SimpleTest.finish();
}
}
var gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
SimpleTest.waitForExplicitFinish();
addLoadEvent(permissionTest);
ok(true, "test passed");
addLoadEvent(next);
</script>
</pre>
</body>

20
dom/settings/tests/test_settings_blobs.html
View File

@ -21,9 +21,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=821630
"use strict";
if (!SpecialPowers.getBoolPref("dom.mozSettings.enabled")) {
if (SpecialPowers.isMainProcess()) {
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
}
SpecialPowers.addPermission("settings-read", true, document);
@ -43,8 +42,6 @@ function onFailure() {
}
}
function tests() {
let mozSettings = window.navigator.mozSettings;
let req;
@ -147,21 +144,8 @@ function next() {
}
}
function permissionTest() {
if (gSettingsEnabled) {
next();
} else {
is(mozSettings, null, "mozSettings is null when not enabled.");
SimpleTest.finish();
}
}
permissionTest();
}
let gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
addLoadEvent(tests);
SimpleTest.waitForExplicitFinish();
addLoadEvent(next);
</script>
</pre>
</body>

22
dom/settings/tests/test_settings_onsettingchange.html
View File

@ -21,16 +21,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=678695
"use strict";
if (!SpecialPowers.getBoolPref("dom.mozSettings.enabled")) {
if (SpecialPowers.isMainProcess()) {
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
}
SpecialPowers.addPermission("settings-write", true, document);
SpecialPowers.addPermission("settings-read", true, document);
function tests() {
var screenBright = {"screen.brightness": 0.7};
function onFailure() {
@ -273,23 +270,8 @@ function next() {
index += 1;
}
function permissionTest() {
if (gSettingsEnabled) {
next();
} else {
is(mozSettings, null, "mozSettings is null when not enabled.");
SimpleTest.finish();
}
}
permissionTest();
}
var gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
addLoadEvent(tests);
SimpleTest.waitForExplicitFinish();
ok(true, "test passed");
addLoadEvent(next);
</script>
</pre>
</body>

5
dom/telephony/test/marionette/test_outgoing_emergency_in_airplane_mode.js
View File

@ -5,10 +5,6 @@ MARIONETTE_TIMEOUT = 60000;
const KEY = "ril.radio.disabled";
let gSettingsEnabled = SpecialPowers.getBoolPref("dom.mozSettings.enabled");
if (!gSettingsEnabled) {
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
}
SpecialPowers.addPermission("telephony", true, document);
SpecialPowers.addPermission("settings-write", true, document);
@ -157,7 +153,6 @@ function hangUp() {
function cleanUp() {
SpecialPowers.removePermission("telephony", document);
SpecialPowers.removePermission("settings-write", document);
SpecialPowers.clearUserPref("dom.mozSettings.enabled");
finish();
}

5
dom/tests/mochitest/geolocation/test_mozsettings.html
View File

@ -23,11 +23,12 @@ SimpleTest.waitForExplicitFinish();
resume_geolocationProvider();
force_prompt(true);
if (SpecialPowers.isMainProcess()) {
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
}
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
SpecialPowers.addPermission("settings-read", true, document);
SpecialPowers.addPermission("settings-write", true, document);
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
ok(navigator.geolocation, "get geolocation object");

5
dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
View File

@ -23,11 +23,12 @@ SimpleTest.waitForExplicitFinish();
resume_geolocationProvider();
force_prompt(true);
if (SpecialPowers.isMainProcess()) {
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
}
SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
SpecialPowers.addPermission("settings-read", true, document);
SpecialPowers.addPermission("settings-write", true, document);
SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
ok(navigator.geolocation, "get geolocation object");

1
modules/libpref/src/init/all.js
View File

@ -4093,6 +4093,7 @@ pref("dom.mozNetworkStats.enabled", false);
// WebSettings
pref("dom.mozSettings.enabled", false);
pref("dom.navigator-property.disable.mozSettings", true);
pref("dom.mozPermissionSettings.enabled", false);
// W3C touch events

4
testing/profiles/prefs_general.js
View File

@ -118,3 +118,7 @@ user_pref("layout.css.report_errors", true);
user_pref("dom.mozContacts.enabled", true);
user_pref("dom.navigator-property.disable.mozContacts", false);
user_pref("dom.global-constructor.disable.mozContact", false);
// Enable mozSettings
user_pref("dom.mozSettings.enabled", true);
user_pref("dom.navigator-property.disable.mozSettings", false);