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

Upgrade to rustc ba2f13ef0 2015-02-04

Browse source
This commit is contained in:
Simon Sapin 2015-01-31 14:36:05 +01:00 • committed by Matt Brubeck
parent bc6882bdef
commit d5dd1d658e
136 changed files with 1091 additions and 878 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/stylesheets.rs
View file

@ -19,7 +19,7 @@ use media_queries::{self, Device, MediaQueryList, parse_media_query_list};
use font_face::{FontFaceRule, Source, parse_font_face_block, iter_font_face_rules_inner};
#[derive(Clone, PartialEq, Eq, Copy, Show)]
#[derive(Clone, PartialEq, Eq, Copy, Debug)]
pub enum Origin {
UserAgent,
Author,
@ -27,7 +27,7 @@ pub enum Origin {
}
#[derive(Show, PartialEq)]
#[derive(Debug, PartialEq)]
pub struct Stylesheet {
/// List of rules in the order they were found (important for
/// cascading order)
@ -36,7 +36,7 @@ pub struct Stylesheet {
}
#[derive(Show, PartialEq)]
#[derive(Debug, PartialEq)]
pub enum CSSRule {
Charset(String),
Namespace(Option<String>, Namespace),
@ -45,14 +45,14 @@ pub enum CSSRule {
FontFace(FontFaceRule),
}
#[derive(Show, PartialEq)]
#[derive(Debug, PartialEq)]
pub struct MediaRule {
pub media_queries: MediaQueryList,
pub rules: Vec<CSSRule>,
}
#[derive(Show, PartialEq)]
#[derive(Debug, PartialEq)]
pub struct StyleRule {
pub selectors: Vec<Selector>,
pub declarations: PropertyDeclarationBlock,
@ -106,8 +106,9 @@ impl Stylesheet {
rules.push(rule);
}
Err(range) => {
let pos = range.start;
let message = format!("Invalid rule: '{}'", iter.input.slice(range));
log_css_error(iter.input, range.start, &*message);
log_css_error(iter.input, pos, &*message);
}
}
}
@ -126,8 +127,9 @@ fn parse_nested_rules(context: &ParserContext, input: &mut Parser) -> Vec<CSSRul
match result {
Ok(rule) => rules.push(rule),
Err(range) => {
let pos = range.start;
let message = format!("Unsupported rule: '{}'", iter.input.slice(range));
log_css_error(iter.input, range.start, &*message);
log_css_error(iter.input, pos, &*message);
}
}
}