diff options
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/css.rs | 2 | ||||
-rw-r--r-- | components/script/dom/cssmediarule.rs | 2 | ||||
-rw-r--r-- | components/script/dom/csssupportsrule.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmllinkelement.rs | 3 | ||||
-rw-r--r-- | components/script/dom/htmlstyleelement.rs | 1 | ||||
-rw-r--r-- | components/script/dom/medialist.rs | 6 | ||||
-rw-r--r-- | components/script/dom/window.rs | 5 |
7 files changed, 8 insertions, 13 deletions
diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs index b1b0210d1cf..e8d910761fe 100644 --- a/components/script/dom/css.rs +++ b/components/script/dom/css.rs @@ -38,7 +38,6 @@ impl CSS { let url = win.Document().url(); let context = ParserContext::new_for_cssom( &url, - win.css_error_reporter(), Some(CssRuleType::Style), PARSING_MODE_DEFAULT, QuirksMode::NoQuirks @@ -55,7 +54,6 @@ impl CSS { let url = win.Document().url(); let context = ParserContext::new_for_cssom( &url, - win.css_error_reporter(), Some(CssRuleType::Style), PARSING_MODE_DEFAULT, QuirksMode::NoQuirks diff --git a/components/script/dom/cssmediarule.rs b/components/script/dom/cssmediarule.rs index d9855baec02..ff3c32939c2 100644 --- a/components/script/dom/cssmediarule.rs +++ b/components/script/dom/cssmediarule.rs @@ -75,7 +75,7 @@ impl CSSMediaRule { let win = global.as_window(); let url = win.get_url(); let quirks_mode = win.Document().quirks_mode(); - let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Media), + 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); diff --git a/components/script/dom/csssupportsrule.rs b/components/script/dom/csssupportsrule.rs index 5739a53421a..5971eb6a009 100644 --- a/components/script/dom/csssupportsrule.rs +++ b/components/script/dom/csssupportsrule.rs @@ -63,7 +63,7 @@ impl CSSSupportsRule { let win = global.as_window(); let url = win.Document().url(); let quirks_mode = win.Document().quirks_mode(); - let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Supports), + let context = ParserContext::new_for_cssom(&url, Some(CssRuleType::Supports), PARSING_MODE_DEFAULT, quirks_mode); let enabled = cond.eval(&context); diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index d7e5c071f50..9768803d1dc 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -285,9 +285,8 @@ impl HTMLLinkElement { let mut input = ParserInput::new(&mq_str); let mut css_parser = CssParser::new(&mut input); - let win = document.window(); let doc_url = document.url(); - let context = CssParserContext::new_for_cssom(&doc_url, win.css_error_reporter(), Some(CssRuleType::Media), + 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); diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 222f25a9b1d..a18b29bd304 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -86,7 +86,6 @@ impl HTMLStyleElement { let data = node.GetTextContent().expect("Element.textContent must be a string"); let url = win.get_url(); let context = CssParserContext::new_for_cssom(&url, - win.css_error_reporter(), Some(CssRuleType::Media), PARSING_MODE_DEFAULT, doc.quirks_mode()); diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs index ae20f5aa042..937347764b8 100644 --- a/components/script/dom/medialist.rs +++ b/components/script/dom/medialist.rs @@ -77,7 +77,7 @@ impl MediaListMethods for MediaList { let win = global.as_window(); let url = win.get_url(); let quirks_mode = win.Document().quirks_mode(); - let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Media), + let context = ParserContext::new_for_cssom(&url, Some(CssRuleType::Media), PARSING_MODE_DEFAULT, quirks_mode); *media_queries = parse_media_query_list(&context, &mut parser); @@ -114,7 +114,7 @@ impl MediaListMethods for MediaList { let win = global.as_window(); let url = win.get_url(); let quirks_mode = win.Document().quirks_mode(); - let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Media), + let context = ParserContext::new_for_cssom(&url, Some(CssRuleType::Media), PARSING_MODE_DEFAULT, quirks_mode); let m = MediaQuery::parse(&context, &mut parser); @@ -143,7 +143,7 @@ impl MediaListMethods for MediaList { let win = global.as_window(); let url = win.get_url(); let quirks_mode = win.Document().quirks_mode(); - let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Media), + let context = ParserContext::new_for_cssom(&url, Some(CssRuleType::Media), PARSING_MODE_DEFAULT, quirks_mode); let m = MediaQuery::parse(&context, &mut parser); diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index d45a6b9bc17..6f0ecfdedcd 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -105,7 +105,6 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::{Sender, channel}; use std::sync::mpsc::TryRecvError::{Disconnected, Empty}; use style::context::ReflowGoal; -use style::error_reporting::ParseErrorReporter; use style::media_queries; use style::parser::ParserContext as CssParserContext; use style::properties::PropertyId; @@ -377,7 +376,7 @@ impl Window { &self.bluetooth_extra_permission_data } - pub fn css_error_reporter(&self) -> &ParseErrorReporter { + pub fn css_error_reporter(&self) -> &CSSErrorReporter { &self.error_reporter } @@ -1012,7 +1011,7 @@ impl WindowMethods for Window { let mut parser = Parser::new(&mut input); let url = self.get_url(); let quirks_mode = self.Document().quirks_mode(); - let context = CssParserContext::new_for_cssom(&url, self.css_error_reporter(), Some(CssRuleType::Media), + 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); |