diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 1d0ba9728cb..52bcba2bc45 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -1531,6 +1531,7 @@ fn get_ua_stylesheets() -> Result { None, None, Origin::UserAgent, + Default::default(), Box::new(StdoutErrorReporter), ParserContextExtraData::default())) } @@ -1543,8 +1544,8 @@ fn get_ua_stylesheets() -> Result { } for &(ref contents, ref url) in &opts::get().user_stylesheets { user_or_user_agent_stylesheets.push(Stylesheet::from_bytes( - &contents, url.clone(), None, None, Origin::User, Box::new(StdoutErrorReporter), - ParserContextExtraData::default())); + &contents, url.clone(), None, None, Origin::User, Default::default(), + Box::new(StdoutErrorReporter), ParserContextExtraData::default())); } let quirks_mode_stylesheet = try!(parse_ua_stylesheet("quirks-mode.css")); diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index f670d8757e3..43fba5cdf10 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -370,12 +370,10 @@ impl FetchResponseListener for StylesheetContext { let win = window_from_node(&*elem); - let mut sheet = Stylesheet::from_bytes(&data, final_url, protocol_encoding_label, - Some(environment_encoding), Origin::Author, - win.css_error_reporter(), - ParserContextExtraData::default()); - sheet.set_media(self.media.take().unwrap()); - let sheet = Arc::new(sheet); + let sheet = Arc::new(Stylesheet::from_bytes( + &data, final_url, protocol_encoding_label, Some(environment_encoding), + Origin::Author, self.media.take().unwrap(), win.css_error_reporter(), + ParserContextExtraData::default())); let win = window_from_node(&*elem); win.layout_chan().send(Msg::AddStylesheet(sheet.clone())).unwrap(); diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 577e290a3ea..d65153bee31 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -65,10 +65,9 @@ impl HTMLStyleElement { }; let data = node.GetTextContent().expect("Element.textContent must be a string"); - let mut sheet = Stylesheet::from_str(&data, url, Origin::Author, win.css_error_reporter(), - ParserContextExtraData::default()); - let mut css_parser = CssParser::new(&mq_str); - sheet.set_media(parse_media_query_list(&mut css_parser)); + let mq = parse_media_query_list(&mut CssParser::new(&mq_str)); + let sheet = Stylesheet::from_str(&data, url, Origin::Author, mq, win.css_error_reporter(), + ParserContextExtraData::default()); let sheet = Arc::new(sheet); win.layout_chan().send(Msg::AddStylesheet(sheet.clone())).unwrap(); diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs index 3e90a1fbec5..6b417231961 100644 --- a/components/style/stylesheets.rs +++ b/components/style/stylesheets.rs @@ -174,15 +174,17 @@ impl Stylesheet { base_url: ServoUrl, protocol_encoding_label: Option<&str>, environment_encoding: Option, - origin: Origin, error_reporter: Box, + origin: Origin, + media: MediaList, + error_reporter: Box, extra_data: ParserContextExtraData) -> Stylesheet { let (string, _) = decode_stylesheet_bytes( bytes, protocol_encoding_label, environment_encoding); - Stylesheet::from_str(&string, base_url, origin, error_reporter, extra_data) + Stylesheet::from_str(&string, base_url, origin, media, error_reporter, extra_data) } - pub fn from_str(css: &str, base_url: ServoUrl, origin: Origin, + pub fn from_str(css: &str, base_url: ServoUrl, origin: Origin, media: MediaList, error_reporter: Box, extra_data: ParserContextExtraData) -> Stylesheet { let rule_parser = TopLevelRuleParser { @@ -212,17 +214,12 @@ impl Stylesheet { Stylesheet { origin: origin, rules: rules.into(), - media: Arc::new(RwLock::new(Default::default())), + media: Arc::new(RwLock::new(media)), dirty_on_viewport_size_change: input.seen_viewport_percentages(), } } - /// Set the MediaList associated with the style-sheet. - pub fn set_media(&mut self, media: MediaList) { - *self.media.write() = media; - } - /// Returns whether the style-sheet applies for the current device depending /// on the associated MediaList. /// diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 763170ba8fe..489e2c03b62 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -174,8 +174,8 @@ pub extern "C" fn Servo_StyleSheet_Empty(mode: SheetParsingMode) -> RawServoStyl SheetParsingMode::eUserSheetFeatures => Origin::User, SheetParsingMode::eAgentSheetFeatures => Origin::UserAgent, }; - let sheet = Arc::new(Stylesheet::from_str("", url, origin, Box::new(StdoutErrorReporter), - extra_data)); + let sheet = Arc::new(Stylesheet::from_str( + "", url, origin, Default::default(), Box::new(StdoutErrorReporter), extra_data)); unsafe { transmute(sheet) } @@ -204,8 +204,8 @@ pub extern "C" fn Servo_StyleSheet_FromUTF8Bytes(data: *const nsACString, referrer: Some(GeckoArcURI::new(referrer)), principal: Some(GeckoArcPrincipal::new(principal)), }}; - let sheet = Arc::new(Stylesheet::from_str(input, url, origin, Box::new(StdoutErrorReporter), - extra_data)); + let sheet = Arc::new(Stylesheet::from_str( + input, url, origin, Default::default(), Box::new(StdoutErrorReporter), extra_data)); unsafe { transmute(sheet) } diff --git a/tests/unit/style/media_queries.rs b/tests/unit/style/media_queries.rs index ced55a27f60..cfe91281aa6 100644 --- a/tests/unit/style/media_queries.rs +++ b/tests/unit/style/media_queries.rs @@ -26,8 +26,9 @@ impl ParseErrorReporter for CSSErrorReporterTest { fn test_media_rule(css: &str, callback: F) where F: Fn(&MediaList, &str) { let url = ServoUrl::parse("http://localhost").unwrap(); - let stylesheet = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest), - ParserContextExtraData::default()); + let stylesheet = Stylesheet::from_str( + css, url, Origin::Author, Default::default(), + Box::new(CSSErrorReporterTest), ParserContextExtraData::default()); let mut rule_count = 0; media_queries(&stylesheet.rules.0.read(), &mut |mq| { rule_count += 1; @@ -49,8 +50,9 @@ fn media_queries(rules: &[CssRule], f: &mut F) where F: FnMut(&MediaList) { fn media_query_test(device: &Device, css: &str, expected_rule_count: usize) { let url = ServoUrl::parse("http://localhost").unwrap(); - let ss = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest), - ParserContextExtraData::default()); + let ss = Stylesheet::from_str( + css, url, Origin::Author, Default::default(), + Box::new(CSSErrorReporterTest), ParserContextExtraData::default()); let mut rule_count = 0; ss.effective_style_rules(device, |_| rule_count += 1); assert!(rule_count == expected_rule_count, css.to_owned()); diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs index 978d012c2d7..7cfcc961895 100644 --- a/tests/unit/style/stylesheets.rs +++ b/tests/unit/style/stylesheets.rs @@ -49,7 +49,7 @@ fn test_parse_stylesheet() { } }"; let url = ServoUrl::parse("about::test").unwrap(); - let stylesheet = Stylesheet::from_str(css, url, Origin::UserAgent, + let stylesheet = Stylesheet::from_str(css, url, Origin::UserAgent, Default::default(), Box::new(CSSErrorReporterTest), ParserContextExtraData::default()); let expected = Stylesheet { @@ -320,7 +320,7 @@ fn test_report_error_stylesheet() { let errors = error_reporter.errors.clone(); - Stylesheet::from_str(css, url, Origin::UserAgent, error_reporter, + Stylesheet::from_str(css, url, Origin::UserAgent, Default::default(), error_reporter, ParserContextExtraData::default()); let mut errors = errors.lock().unwrap(); diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs index 97e527395d4..a430089ba9b 100644 --- a/tests/unit/style/viewport.rs +++ b/tests/unit/style/viewport.rs @@ -23,6 +23,7 @@ macro_rules! stylesheet { $css, ServoUrl::parse("http://localhost").unwrap(), Origin::$origin, + Default::default(), $error_reporter, ParserContextExtraData::default() ))