Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow setting preferences from the reftest manifest. Add a command-line arg to enable a given preference.

Browse source
This commit is contained in:
Josh Matthews 2015-08-27 10:56:36 -04:00
parent a3ee9b5dd9
commit 6e26fefad1
5 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/util/opts.rs
View file

@ -10,6 +10,7 @@ use geometry::ScreenPx;
use euclid::size::{Size2D, TypedSize2D};
use getopts::Options;
use num_cpus;
use prefs;
use std::cmp;
use std::default::Default;
use std::env;
@ -455,6 +456,8 @@ pub fn from_cmdline_args(args: &[String]) {
opts.optflag("h", "help", "Print this message");
opts.optopt("", "resources-path", "Path to find static resources", "/home/servo/resources");
opts.optflag("", "sniff-mime-types" , "Enable MIME sniffing");
opts.optmulti("", "pref",
"A preference to set to enable", "dom.mozbrowser.enabled");
let opt_match = match opts.parse(args) {
Ok(m) => m,
@ -623,6 +626,12 @@ pub fn from_cmdline_args(args: &[String]) {
};
set_defaults(opts);
// This must happen after setting the default options, since the prefs rely on
// on the resource path.
for pref in opt_match.opt_strs("pref").iter() {
prefs::set_pref(pref, true);
}
}
// Make Opts available globally. This saves having to clone and pass

4
components/util/prefs.rs
View file

@ -45,6 +45,6 @@ pub fn get_pref(name: &str, default: bool) -> bool {
*PREFS.lock().unwrap().get(name).unwrap_or(&default)
}
pub fn set_pref(name: String, value: bool) {
let _ = PREFS.lock().unwrap().insert(name, value);
pub fn set_pref(name: &str, value: bool) {
let _ = PREFS.lock().unwrap().insert(name.to_owned(), value);
}