mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #18341 - ferjm:bug1384225.media.errors, r=jdm
stylo: Error reporting for unknown media features - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix [bug 1384225](https://bugzilla.mozilla.org/show_bug.cgi?id=1384225) <!-- 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/18341) <!-- Reviewable:end -->
This commit is contained in:
commit
fef2cfde8c
12 changed files with 206 additions and 109 deletions
|
@ -72,13 +72,15 @@ impl CSSMediaRule {
|
|||
let mut input = ParserInput::new(&text);
|
||||
let mut input = Parser::new(&mut input);
|
||||
let global = self.global();
|
||||
let win = global.as_window();
|
||||
let url = win.get_url();
|
||||
let quirks_mode = win.Document().quirks_mode();
|
||||
let window = global.as_window();
|
||||
let url = window.get_url();
|
||||
let quirks_mode = window.Document().quirks_mode();
|
||||
let context = ParserContext::new_for_cssom(&url, Some(CssRuleType::Media),
|
||||
PARSING_MODE_DEFAULT,
|
||||
quirks_mode);
|
||||
let new_medialist = parse_media_query_list(&context, &mut input);
|
||||
|
||||
let new_medialist = parse_media_query_list(&context, &mut input,
|
||||
window.css_error_reporter());
|
||||
let mut guard = self.cssconditionrule.shared_lock().write();
|
||||
|
||||
// Clone an Arc because we can’t borrow `guard` twice at the same time.
|
||||
|
|
|
@ -289,7 +289,9 @@ impl HTMLLinkElement {
|
|||
let context = CssParserContext::new_for_cssom(&doc_url, Some(CssRuleType::Media),
|
||||
PARSING_MODE_DEFAULT,
|
||||
document.quirks_mode());
|
||||
let media = parse_media_query_list(&context, &mut css_parser);
|
||||
let window = document.window();
|
||||
let media = parse_media_query_list(&context, &mut css_parser,
|
||||
window.css_error_reporter());
|
||||
|
||||
let im_attribute = element.get_attribute(&ns!(), &local_name!("integrity"));
|
||||
let integrity_val = im_attribute.r().map(|a| a.value());
|
||||
|
|
|
@ -74,7 +74,7 @@ impl HTMLStyleElement {
|
|||
let element = self.upcast::<Element>();
|
||||
assert!(node.is_in_doc());
|
||||
|
||||
let win = window_from_node(node);
|
||||
let window = window_from_node(node);
|
||||
let doc = document_from_node(self);
|
||||
|
||||
let mq_attribute = element.get_attribute(&ns!(), &local_name!("media"));
|
||||
|
@ -84,19 +84,22 @@ impl HTMLStyleElement {
|
|||
};
|
||||
|
||||
let data = node.GetTextContent().expect("Element.textContent must be a string");
|
||||
let url = win.get_url();
|
||||
let url = window.get_url();
|
||||
let context = CssParserContext::new_for_cssom(&url,
|
||||
Some(CssRuleType::Media),
|
||||
PARSING_MODE_DEFAULT,
|
||||
doc.quirks_mode());
|
||||
let shared_lock = node.owner_doc().style_shared_lock().clone();
|
||||
let mut input = ParserInput::new(&mq_str);
|
||||
let mq = Arc::new(shared_lock.wrap(
|
||||
parse_media_query_list(&context, &mut CssParser::new(&mut input))));
|
||||
let css_error_reporter = window.css_error_reporter();
|
||||
let mq = Arc::new(shared_lock.wrap(parse_media_query_list(&context,
|
||||
&mut CssParser::new(&mut input),
|
||||
css_error_reporter)));
|
||||
let loader = StylesheetLoader::for_element(self.upcast());
|
||||
let sheet = Stylesheet::from_str(&data, win.get_url(), Origin::Author, mq,
|
||||
let sheet = Stylesheet::from_str(&data, window.get_url(),
|
||||
Origin::Author, mq,
|
||||
shared_lock, Some(&loader),
|
||||
win.css_error_reporter(),
|
||||
css_error_reporter,
|
||||
doc.quirks_mode(),
|
||||
self.line_number as u32);
|
||||
|
||||
|
|
|
@ -74,13 +74,14 @@ impl MediaListMethods for MediaList {
|
|||
let mut input = ParserInput::new(&value);
|
||||
let mut parser = Parser::new(&mut input);
|
||||
let global = self.global();
|
||||
let win = global.as_window();
|
||||
let url = win.get_url();
|
||||
let quirks_mode = win.Document().quirks_mode();
|
||||
let window = global.as_window();
|
||||
let url = window.get_url();
|
||||
let quirks_mode = window.Document().quirks_mode();
|
||||
let context = ParserContext::new_for_cssom(&url, Some(CssRuleType::Media),
|
||||
PARSING_MODE_DEFAULT,
|
||||
quirks_mode);
|
||||
*media_queries = parse_media_query_list(&context, &mut parser);
|
||||
*media_queries = parse_media_query_list(&context, &mut parser,
|
||||
window.css_error_reporter());
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/cssom/#dom-medialist-length
|
||||
|
|
|
@ -1012,7 +1012,8 @@ impl WindowMethods for Window {
|
|||
let context = CssParserContext::new_for_cssom(&url, Some(CssRuleType::Media),
|
||||
PARSING_MODE_DEFAULT,
|
||||
quirks_mode);
|
||||
let media_query_list = media_queries::parse_media_query_list(&context, &mut parser);
|
||||
let media_query_list = media_queries::parse_media_query_list(&context, &mut parser,
|
||||
self.css_error_reporter());
|
||||
let document = self.Document();
|
||||
let mql = MediaQueryList::new(&document, media_query_list);
|
||||
self.media_query_lists.push(&*mql);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue