diff options
author | Hiroyuki Ikezoe <hikezoe@mozilla.com> | 2017-05-13 18:33:14 +0900 |
---|---|---|
committer | Hiroyuki Ikezoe <hikezoe@mozilla.com> | 2017-05-14 07:15:19 +0900 |
commit | fcc50ea421f54893d41481e9d95cb4e3b29831ee (patch) | |
tree | a0e2aac36376582e43ac9cbf99f904f5d7dc087f /components/script/dom | |
parent | b80d4acef455d1072df5a4ad7fd1d80fbff8e27c (diff) | |
download | servo-fcc50ea421f54893d41481e9d95cb4e3b29831ee.tar.gz servo-fcc50ea421f54893d41481e9d95cb4e3b29831ee.zip |
Rename LengthParsingMode to ParsingMode and LengthParsingMode::SVG to PasingMode::AllowUnitlessLength.
We need another flag that represents allow-negative-number for SMIL, so
this enum will also comprise the another parsing mode that allows negative number.
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/css.rs | 6 | ||||
-rw-r--r-- | components/script/dom/cssmediarule.rs | 4 | ||||
-rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 4 | ||||
-rw-r--r-- | components/script/dom/csssupportsrule.rs | 4 | ||||
-rw-r--r-- | components/script/dom/htmllinkelement.rs | 4 | ||||
-rw-r--r-- | components/script/dom/htmlstyleelement.rs | 4 | ||||
-rw-r--r-- | components/script/dom/medialist.rs | 8 | ||||
-rw-r--r-- | components/script/dom/window.rs | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs index 72cdbfa5be6..ce71c49e5ef 100644 --- a/components/script/dom/css.rs +++ b/components/script/dom/css.rs @@ -10,7 +10,7 @@ use dom::bindings::str::DOMString; use dom::window::Window; use dom_struct::dom_struct; use style::context::QuirksMode; -use style::parser::{LengthParsingMode, ParserContext}; +use style::parser::{ParsingMode, ParserContext}; use style::stylesheets::CssRuleType; use style::supports::{Declaration, parse_condition_or_declaration}; @@ -32,7 +32,7 @@ impl CSS { let decl = Declaration { prop: property.into(), val: value.into() }; let url = win.Document().url(); let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Supports), - LengthParsingMode::Default, + ParsingMode::Default, QuirksMode::NoQuirks); decl.eval(&context) } @@ -44,7 +44,7 @@ impl CSS { if let Ok(cond) = cond { let url = win.Document().url(); let context = ParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Supports), - LengthParsingMode::Default, + ParsingMode::Default, QuirksMode::NoQuirks); cond.eval(&context) } else { diff --git a/components/script/dom/cssmediarule.rs b/components/script/dom/cssmediarule.rs index afc41d31be0..ef560ce0be1 100644 --- a/components/script/dom/cssmediarule.rs +++ b/components/script/dom/cssmediarule.rs @@ -16,7 +16,7 @@ use dom::medialist::MediaList; use dom::window::Window; use dom_struct::dom_struct; use style::media_queries::parse_media_query_list; -use style::parser::{LengthParsingMode, ParserContext}; +use style::parser::{ParsingMode, ParserContext}; use style::shared_lock::{Locked, ToCssWithGuard}; use style::stylearc::Arc; use style::stylesheets::{CssRuleType, MediaRule}; @@ -75,7 +75,7 @@ impl CSSMediaRule { 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), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); let new_medialist = parse_media_query_list(&context, &mut input); let mut guard = self.cssconditionrule.shared_lock().write(); diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 8b81201de77..797a9e16722 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -17,7 +17,7 @@ use dom_struct::dom_struct; use servo_url::ServoUrl; use std::ascii::AsciiExt; use style::attr::AttrValue; -use style::parser::LengthParsingMode; +use style::parser::ParsingMode; use style::properties::{Importance, PropertyDeclarationBlock, PropertyId, LonghandId, ShorthandId}; use style::properties::{parse_one_declaration, parse_style_attribute}; use style::selector_parser::PseudoElement; @@ -260,7 +260,7 @@ impl CSSStyleDeclaration { let result = parse_one_declaration(id, &value, &self.owner.base_url(), window.css_error_reporter(), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); // Step 7 diff --git a/components/script/dom/csssupportsrule.rs b/components/script/dom/csssupportsrule.rs index 9a0743856d6..23502a3b8c8 100644 --- a/components/script/dom/csssupportsrule.rs +++ b/components/script/dom/csssupportsrule.rs @@ -13,7 +13,7 @@ use dom::cssrule::SpecificCSSRule; use dom::cssstylesheet::CSSStyleSheet; use dom::window::Window; use dom_struct::dom_struct; -use style::parser::{LengthParsingMode, ParserContext}; +use style::parser::{ParsingMode, ParserContext}; use style::shared_lock::{Locked, ToCssWithGuard}; use style::stylearc::Arc; use style::stylesheets::{CssRuleType, SupportsRule}; @@ -63,7 +63,7 @@ impl CSSSupportsRule { 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), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); let enabled = cond.eval(&context); let mut guard = self.cssconditionrule.shared_lock().write(); diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 09f24ace0d7..92dd0b9ed4a 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -32,7 +32,7 @@ use std::cell::Cell; use std::default::Default; use style::attr::AttrValue; use style::media_queries::parse_media_query_list; -use style::parser::{LengthParsingMode, ParserContext as CssParserContext}; +use style::parser::{ParsingMode, ParserContext as CssParserContext}; use style::str::HTML_SPACE_CHARACTERS; use style::stylearc::Arc; use style::stylesheets::{CssRuleType, Stylesheet}; @@ -282,7 +282,7 @@ impl HTMLLinkElement { let win = document.window(); let doc_url = document.url(); let context = CssParserContext::new_for_cssom(&doc_url, win.css_error_reporter(), Some(CssRuleType::Media), - LengthParsingMode::Default, + ParsingMode::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 e96954efe26..cf4011cf811 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -23,7 +23,7 @@ use net_traits::ReferrerPolicy; use script_layout_interface::message::Msg; use std::cell::Cell; use style::media_queries::parse_media_query_list; -use style::parser::{LengthParsingMode, ParserContext as CssParserContext}; +use style::parser::{ParsingMode, ParserContext as CssParserContext}; use style::stylearc::Arc; use style::stylesheets::{CssRuleType, Stylesheet, Origin}; use stylesheet_loader::{StylesheetLoader, StylesheetOwner}; @@ -88,7 +88,7 @@ impl HTMLStyleElement { let context = CssParserContext::new_for_cssom(&url, win.css_error_reporter(), Some(CssRuleType::Media), - LengthParsingMode::Default, + ParsingMode::Default, doc.quirks_mode()); let shared_lock = node.owner_doc().style_shared_lock().clone(); let mq = Arc::new(shared_lock.wrap( diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs index 514bccecc4a..0f3432eefec 100644 --- a/components/script/dom/medialist.rs +++ b/components/script/dom/medialist.rs @@ -14,7 +14,7 @@ use dom::window::Window; use dom_struct::dom_struct; use style::media_queries::{MediaQuery, parse_media_query_list}; use style::media_queries::MediaList as StyleMediaList; -use style::parser::{LengthParsingMode, ParserContext}; +use style::parser::{ParsingMode, ParserContext}; use style::shared_lock::{SharedRwLock, Locked}; use style::stylearc::Arc; use style::stylesheets::CssRuleType; @@ -77,7 +77,7 @@ impl MediaListMethods for MediaList { 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), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); *media_queries = parse_media_query_list(&context, &mut parser); } @@ -113,7 +113,7 @@ impl MediaListMethods for MediaList { 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), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); let m = MediaQuery::parse(&context, &mut parser); // Step 2 @@ -141,7 +141,7 @@ impl MediaListMethods for MediaList { 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), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); let m = MediaQuery::parse(&context, &mut parser); // Step 2 diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index dbcbd054743..3078658bbdb 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -104,7 +104,7 @@ use std::sync::mpsc::TryRecvError::{Disconnected, Empty}; use style::context::ReflowGoal; use style::error_reporting::ParseErrorReporter; use style::media_queries; -use style::parser::{LengthParsingMode, ParserContext as CssParserContext}; +use style::parser::{ParsingMode, ParserContext as CssParserContext}; use style::properties::PropertyId; use style::properties::longhands::overflow_x; use style::selector_parser::PseudoElement; @@ -978,7 +978,7 @@ impl WindowMethods for Window { 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), - LengthParsingMode::Default, + ParsingMode::Default, quirks_mode); let media_query_list = media_queries::parse_media_query_list(&context, &mut parser); let document = self.Document(); |