aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/medialist.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-19 17:47:27 -0400
committerGitHub <noreply@github.com>2018-09-19 17:47:27 -0400
commitdf2adebefdfa3da49f173e480fa1e56450f9bda2 (patch)
tree1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/medialist.rs
parent2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff)
parentc37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff)
downloadservo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz
servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix part of #21373. - [x] These changes do not require tests because they format code only. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21737) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/medialist.rs')
-rw-r--r--components/script/dom/medialist.rs35
1 files changed, 23 insertions, 12 deletions
diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs
index 99800f1beb1..cf918e236d4 100644
--- a/components/script/dom/medialist.rs
+++ b/components/script/dom/medialist.rs
@@ -30,8 +30,10 @@ pub struct MediaList {
impl MediaList {
#[allow(unrooted_must_root)]
- pub fn new_inherited(parent_stylesheet: &CSSStyleSheet,
- media_queries: Arc<Locked<StyleMediaList>>) -> MediaList {
+ pub fn new_inherited(
+ parent_stylesheet: &CSSStyleSheet,
+ media_queries: Arc<Locked<StyleMediaList>>,
+ ) -> MediaList {
MediaList {
parent_stylesheet: Dom::from_ref(parent_stylesheet),
reflector_: Reflector::new(),
@@ -40,12 +42,16 @@ impl MediaList {
}
#[allow(unrooted_must_root)]
- pub fn new(window: &Window, parent_stylesheet: &CSSStyleSheet,
- media_queries: Arc<Locked<StyleMediaList>>)
- -> DomRoot<MediaList> {
- reflect_dom_object(Box::new(MediaList::new_inherited(parent_stylesheet, media_queries)),
- window,
- MediaListBinding::Wrap)
+ pub fn new(
+ window: &Window,
+ parent_stylesheet: &CSSStyleSheet,
+ media_queries: Arc<Locked<StyleMediaList>>,
+ ) -> DomRoot<MediaList> {
+ reflect_dom_object(
+ Box::new(MediaList::new_inherited(parent_stylesheet, media_queries)),
+ window,
+ MediaListBinding::Wrap,
+ )
}
fn shared_lock(&self) -> &SharedRwLock {
@@ -135,7 +141,10 @@ impl MediaListMethods for MediaList {
let m_serialized = m.clone().unwrap().to_css_string();
let mut guard = self.shared_lock().write();
let mq = self.media_queries.write_with(&mut guard);
- let any = mq.media_queries.iter().any(|q| m_serialized == q.to_css_string());
+ let any = mq
+ .media_queries
+ .iter()
+ .any(|q| m_serialized == q.to_css_string());
if any {
return;
}
@@ -169,9 +178,11 @@ impl MediaListMethods for MediaList {
let m_serialized = m.unwrap().to_css_string();
let mut guard = self.shared_lock().write();
let media_list = self.media_queries.write_with(&mut guard);
- let new_vec = media_list.media_queries.drain(..)
- .filter(|q| m_serialized != q.to_css_string())
- .collect();
+ let new_vec = media_list
+ .media_queries
+ .drain(..)
+ .filter(|q| m_serialized != q.to_css_string())
+ .collect();
media_list.media_queries = new_vec;
}
}