From 8bfd4dc1e2f9c71ff3d1f9964565c43a6ae02278 Mon Sep 17 00:00:00 2001 From: Peter Hall Date: Thu, 14 Feb 2019 12:53:59 +0000 Subject: #8539 Config preferences backend restructure --- tests/unit/style/stylesheets.rs | 4 ++-- tests/unit/style/viewport.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs index 68bbff46f9f..fe8a7b84269 100644 --- a/tests/unit/style/stylesheets.rs +++ b/tests/unit/style/stylesheets.rs @@ -9,7 +9,7 @@ use selectors::attr::*; use selectors::parser::*; use servo_arc::Arc; use servo_atoms::Atom; -use servo_config::prefs::{PrefValue, PREFS}; +use servo_config::set_pref; use servo_url::ServoUrl; use std::borrow::ToOwned; use std::cell::RefCell; @@ -339,7 +339,7 @@ impl ParseErrorReporter for TestingErrorReporter { #[test] fn test_report_error_stylesheet() { - PREFS.set("layout.viewport.enabled", PrefValue::Boolean(true)); + set_pref!(layout.viewport.enabled, true); let css = r" div { background-color: red; diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs index b4043038b83..23e6c05dc25 100644 --- a/tests/unit/style/viewport.rs +++ b/tests/unit/style/viewport.rs @@ -6,7 +6,7 @@ use cssparser::{Parser, ParserInput}; use euclid::TypedScale; use euclid::TypedSize2D; use servo_arc::Arc; -use servo_config::prefs::{PrefValue, PREFS}; +use servo_config::set_pref; use servo_url::ServoUrl; use style::context::QuirksMode; use style::media_queries::{Device, MediaList, MediaType}; @@ -45,7 +45,7 @@ fn test_viewport_rule(css: &str, device: &Device, callback: F) where F: Fn(&Vec, &str), { - PREFS.set("layout.viewport.enabled", PrefValue::Boolean(true)); + set_pref!(layout.viewport.enabled, true); let stylesheet = stylesheet!(css, Author); let mut rule_count = 0; stylesheet.effective_viewport_rules(&device, &stylesheet.shared_lock.read(), |rule| { @@ -445,7 +445,7 @@ fn cascading_within_viewport_rule() { #[test] fn multiple_stylesheets_cascading() { - PREFS.set("layout.viewport.enabled", PrefValue::Boolean(true)); + set_pref!(layout.viewport.enabled, true); let device = Device::new( MediaType::screen(), TypedSize2D::new(800., 600.), -- cgit v1.2.3