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

Auto merge of #7391 - jdm:prefs, r=Ms2ger

Browse source 
Replace catch-all experimental flag with fine-grained boolean prefere…

…nces initialized from a JSON document.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7391)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-28 10:08:32 -06:00
commit 72125f070d
14 changed files with 122 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/style/viewport.rs
View file

@ -25,7 +25,7 @@ fn test_viewport_rule<F>(css: &str,
callback: F)
where F: Fn(&Vec<ViewportDescriptorDeclaration>, &str)
{
::util::opts::set_experimental_enabled(true);
::util::prefs::set_pref("layout.viewport.enabled", true);
let stylesheet = stylesheet!(css, Author);
let mut rule_count = 0;
@ -172,7 +172,7 @@ fn cascading_within_viewport_rule() {
#[test]
fn multiple_stylesheets_cascading() {
::util::opts::set_experimental_enabled(true);
::util::prefs::set_pref("layout.viewport.enabled", true);
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
let stylesheets = vec![