mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Move CSSReporter from script_layout_interface to script
This commit is contained in:
parent
17ee21bf9d
commit
64755705fb
6 changed files with 40 additions and 58 deletions
|
@ -21,7 +21,6 @@ gfx_traits = {path = "../gfx_traits"}
|
|||
html5ever = "0.22"
|
||||
ipc-channel = "0.11"
|
||||
libc = "0.2"
|
||||
log = "0.4"
|
||||
time = "0.1.17"
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = "0.1"
|
||||
|
|
|
@ -11,12 +11,9 @@
|
|||
#[macro_use]
|
||||
extern crate html5ever;
|
||||
#[macro_use]
|
||||
extern crate log;
|
||||
#[macro_use]
|
||||
extern crate malloc_size_of_derive;
|
||||
|
||||
pub mod message;
|
||||
pub mod reporter;
|
||||
pub mod rpc;
|
||||
pub mod wrapper_traits;
|
||||
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use cssparser::SourceLocation;
|
||||
use ipc_channel::ipc::IpcSender;
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use script_traits::ConstellationControlMsg;
|
||||
use servo_url::ServoUrl;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use style::error_reporting::{ContextualParseError, ParseErrorReporter};
|
||||
|
||||
#[derive(Clone, MallocSizeOf)]
|
||||
pub struct CSSErrorReporter {
|
||||
pub pipelineid: PipelineId,
|
||||
// Arc+Mutex combo is necessary to make this struct Sync,
|
||||
// which is necessary to fulfill the bounds required by the
|
||||
// uses of the ParseErrorReporter trait.
|
||||
#[ignore_malloc_size_of = "Arc is defined in libstd"]
|
||||
pub script_chan: Arc<Mutex<IpcSender<ConstellationControlMsg>>>,
|
||||
}
|
||||
|
||||
impl ParseErrorReporter for CSSErrorReporter {
|
||||
fn report_error(&self, url: &ServoUrl, location: SourceLocation, error: ContextualParseError) {
|
||||
if log_enabled!(log::Level::Info) {
|
||||
info!(
|
||||
"Url:\t{}\n{}:{} {}",
|
||||
url.as_str(),
|
||||
location.line,
|
||||
location.column,
|
||||
error
|
||||
)
|
||||
}
|
||||
|
||||
//TODO: report a real filename
|
||||
let _ = self
|
||||
.script_chan
|
||||
.lock()
|
||||
.unwrap()
|
||||
.send(ConstellationControlMsg::ReportCSSError(
|
||||
self.pipelineid,
|
||||
"".to_owned(),
|
||||
location.line,
|
||||
location.column,
|
||||
error.to_string(),
|
||||
));
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue