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

Replace more RwLock<MediaList> with shared_lock::Locked<MediaList>

Browse source
This commit is contained in:
Simon Sapin 2017-03-17 01:02:55 +01:00
parent fe4e70c5f8
commit 600152bd00
8 changed files with 79 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/cssmediarule.rs
View file

@ -50,22 +50,25 @@ impl CSSMediaRule {
fn medialist(&self) -> Root<MediaList> {
self.medialist.or_init(|| MediaList::new(self.global().as_window(),
self.cssconditionrule.parent_stylesheet(),
self.mediarule.read().media_queries.clone()))
}
/// https://drafts.csswg.org/css-conditional-3/#the-cssmediarule-interface
pub fn get_condition_text(&self) -> DOMString {
let guard = self.cssconditionrule.shared_lock().read();
let rule = self.mediarule.read();
let list = rule.media_queries.read();
let list = rule.media_queries.read_with(&guard);
list.to_css_string().into()
}
/// https://drafts.csswg.org/css-conditional-3/#the-cssmediarule-interface
pub fn set_condition_text(&self, text: DOMString) {
let mut guard = self.cssconditionrule.shared_lock().write();
let mut input = Parser::new(&text);
let new_medialist = parse_media_query_list(&mut input);
let rule = self.mediarule.read();
let mut list = rule.media_queries.write();
let mut list = rule.media_queries.write_with(&mut guard);
*list = new_medialist;
}
}