Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stop parsing @supports rules before Delimeter::Bang

Browse source
This commit is contained in:
Manish Goregaokar 2017-06-05 13:41:03 -07:00
parent b584944f17
commit 4ad3224ba8
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/stylesheets/supports_rule.rs
View file

@ -4,7 +4,7 @@
//! [@supports rules](https://drafts.csswg.org/css-conditional-3/#at-supports) //! [@supports rules](https://drafts.csswg.org/css-conditional-3/#at-supports)
use cssparser::{parse_important, Parser, SourceLocation, Token}; use cssparser::{Delimiter, parse_important, Parser, SourceLocation, Token};
use parser::ParserContext; use parser::ParserContext;
use properties::{PropertyId, PropertyDeclaration, SourcePropertyDeclaration}; use properties::{PropertyId, PropertyDeclaration, SourcePropertyDeclaration};
use shared_lock::{DeepCloneWithLock, Locked, SharedRwLock, SharedRwLockReadGuard, ToCssWithGuard}; use shared_lock::{DeepCloneWithLock, Locked, SharedRwLock, SharedRwLockReadGuard, ToCssWithGuard};
@ -263,7 +263,10 @@ impl Declaration {
let mut input = Parser::new(&self.val); let mut input = Parser::new(&self.val);
let context = ParserContext::new_with_rule_type(cx, Some(CssRuleType::Style)); let context = ParserContext::new_with_rule_type(cx, Some(CssRuleType::Style));
let mut declarations = SourcePropertyDeclaration::new(); let mut declarations = SourcePropertyDeclaration::new();
let res = PropertyDeclaration::parse_into(&mut declarations, id, &context, &mut input); let res = input.parse_until_before(Delimiter::Bang, |input| {
PropertyDeclaration::parse_into(&mut declarations, id, &context, input)
.map_err(|_| ())
});
let _ = input.try(parse_important); let _ = input.try(parse_important);
res.is_ok() && input.is_exhausted() res.is_ok() && input.is_exhausted()
} }