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

Make log_css_error in parser.rs take a &ParserContext argument and call this method

Browse source
This commit is contained in:
GauriGNaik 2015-11-07 20:14:57 -05:00 • committed by Josh Matthews
parent a8cbc28643
commit afdc60fa57
5 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/font_face.rs
View file

@ -40,7 +40,7 @@ pub fn parse_font_face_block(context: &ParserContext, input: &mut Parser)
let pos = range.start; let pos = range.start;
let message = format!("Unsupported @font-face descriptor declaration: '{}'", let message = format!("Unsupported @font-face descriptor declaration: '{}'",
iter.input.slice(range)); iter.input.slice(range));
log_css_error(iter.input, pos, &*message); log_css_error(iter.input, pos, &*message, context);
} }
Ok(FontFaceDescriptorDeclaration::Family(value)) => { Ok(FontFaceDescriptorDeclaration::Family(value)) => {
family = Some(value); family = Some(value);

8
components/style/parser.rs
View file

@ -43,10 +43,6 @@ impl<'a> ParserContext<'a> {
/// Defaults to a no-op. /// Defaults to a no-op.
/// Set a `RUST_LOG=style::errors` environment variable /// Set a `RUST_LOG=style::errors` environment variable
/// to log CSS parse errors to stderr. /// to log CSS parse errors to stderr.
pub fn log_css_error(input: &mut Parser, position: SourcePosition, message: &str) { pub fn log_css_error(input: &mut Parser, position: SourcePosition, message: &str, parsercontext: &ParserContext) {
if log_enabled!(log::LogLevel::Info) { parsercontext.error_reporter.report_error(input, position, message);
let location = input.source_location(position);
// TODO eventually this will got into a "web console" or something.
info!("{}:{} {}", location.line, location.column, message)
}
} }

2
components/style/properties.mako.rs
View file

@ -5739,7 +5739,7 @@ pub fn parse_property_declaration_list(context: &ParserContext, input: &mut Pars
let pos = range.start; let pos = range.start;
let message = format!("Unsupported property declaration: '{}'", let message = format!("Unsupported property declaration: '{}'",
iter.input.slice(range)); iter.input.slice(range));
log_css_error(iter.input, pos, &*message); log_css_error(iter.input, pos, &*message, &context);
} }
} }
} }

7
components/style/stylesheets.rs
View file

@ -108,7 +108,7 @@ impl Stylesheet {
pub fn from_str(css: &str, base_url: Url, origin: Origin, pub fn from_str(css: &str, base_url: Url, origin: Origin,
error_reporter: Box<ParseErrorReporter + Send>) -> Stylesheet { error_reporter: Box<ParseErrorReporter + Send>) -> Stylesheet {
let rule_parser = TopLevelRuleParser { let rule_parser = TopLevelRuleParser {
context: ParserContext::new(origin, &base_url, error_reporter), context: ParserContext::new(origin, &base_url, error_reporter.clone()),
state: Cell::new(State::Start), state: Cell::new(State::Start),
}; };
let mut input = Parser::new(css); let mut input = Parser::new(css);
@ -131,7 +131,8 @@ impl Stylesheet {
Err(range) => { Err(range) => {
let pos = range.start; let pos = range.start;
let message = format!("Invalid rule: '{}'", iter.input.slice(range)); let message = format!("Invalid rule: '{}'", iter.input.slice(range));
log_css_error(iter.input, pos, &*message); let context = ParserContext::new(origin, &base_url, error_reporter.clone());
log_css_error(iter.input, pos, &*message, &context);
} }
} }
} }
@ -329,7 +330,7 @@ fn parse_nested_rules(context: &ParserContext, input: &mut Parser) -> Vec<CSSRul
Err(range) => { Err(range) => {
let pos = range.start; let pos = range.start;
let message = format!("Unsupported rule: '{}'", iter.input.slice(range)); let message = format!("Unsupported rule: '{}'", iter.input.slice(range));
log_css_error(iter.input, pos, &*message); log_css_error(iter.input, pos, &*message, &context);
} }
} }
} }

2
components/style/viewport.rs
View file

@ -271,7 +271,7 @@ impl ViewportRule {
let pos = range.start; let pos = range.start;
let message = format!("Unsupported @viewport descriptor declaration: '{}'", let message = format!("Unsupported @viewport descriptor declaration: '{}'",
input.slice(range)); input.slice(range));
log_css_error(input, pos, &*message); log_css_error(input, pos, &*message, &context);
} }
Ok(ViewportRule { declarations: valid_declarations.iter().cascade() }) Ok(ViewportRule { declarations: valid_declarations.iter().cascade() })