aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/cssmediarule.rs
diff options
context:
space:
mode:
authorJ. Ryan Stinnett <jryans@gmail.com>2017-04-11 16:00:37 +0800
committerJ. Ryan Stinnett <jryans@gmail.com>2017-04-12 16:40:48 +0800
commit1a31b87c22adbd2b7a7350500e089fad3fa49453 (patch)
treeec991601022825c1534b2d7a265c735febfef067 /components/script/dom/cssmediarule.rs
parent1ae1d370f23d5b74902a1f7dc87421e516b5ac2e (diff)
downloadservo-1a31b87c22adbd2b7a7350500e089fad3fa49453.tar.gz
servo-1a31b87c22adbd2b7a7350500e089fad3fa49453.zip
Pass ParserContext down to lengths
To make it possible to check the rule type when parsing lengths, we need to pass the `ParserContext` down through many layers to the place where length units are parsed. This change leaves it unused, so it's only to prepare for the next change. MozReview-Commit-ID: 70YwtcCxnWw
Diffstat (limited to 'components/script/dom/cssmediarule.rs')
-rw-r--r--components/script/dom/cssmediarule.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/components/script/dom/cssmediarule.rs b/components/script/dom/cssmediarule.rs
index c6bb86bc287..a151ee81cec 100644
--- a/components/script/dom/cssmediarule.rs
+++ b/components/script/dom/cssmediarule.rs
@@ -16,6 +16,7 @@ use dom::window::Window;
use dom_struct::dom_struct;
use std::sync::Arc;
use style::media_queries::parse_media_query_list;
+use style::parser::ParserContext;
use style::shared_lock::{Locked, ToCssWithGuard};
use style::stylesheets::{CssRuleType, MediaRule};
use style_traits::ToCss;
@@ -68,10 +69,11 @@ impl CSSMediaRule {
/// https://drafts.csswg.org/css-conditional-3/#the-cssmediarule-interface
pub fn set_condition_text(&self, text: DOMString) {
let mut input = Parser::new(&text);
- let win = self.global().as_window();
- let url = win.Document().url();
+ let global = self.global();
+ let win = global.as_window();
+ let url = win.get_url();
let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Media));
- let new_medialist = parse_media_query_list(&mut input);
+ let new_medialist = parse_media_query_list(&context, &mut input);
let mut guard = self.cssconditionrule.shared_lock().write();
// Clone an Arc because we can’t borrow `guard` twice at the same time.