servo: Merge #8972 - M1501: CSS Error Reporting: Final Steps Last Part (from GauriGNaik:expose-css-errors-1); r=jdm
Source-Repo: https://github.com/servo/servo Source-Revision: a5a7a8318cbb9cc1338e9894aee61221a2fa3f27
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
//! loop.
|
||||
|
||||
use devtools;
|
||||
use devtools_traits::CSSError;
|
||||
use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo};
|
||||
use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
|
||||
use document_loader::DocumentLoader;
|
||||
@@ -703,14 +704,6 @@ pub unsafe extern "C" fn shadow_check_callback(_cx: *mut JSContext,
|
||||
DOMProxyShadowsResult::ShadowCheckFailed
|
||||
}
|
||||
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
pub struct CSSError {
|
||||
filename: String,
|
||||
line: usize,
|
||||
column: usize,
|
||||
msg: String
|
||||
}
|
||||
|
||||
impl ScriptThread {
|
||||
pub fn page_fetch_complete(id: PipelineId, subpage: Option<SubpageId>, metadata: Metadata)
|
||||
-> Option<ParserRoot> {
|
||||
@@ -2181,7 +2174,7 @@ impl ScriptThread {
|
||||
}
|
||||
|
||||
fn handle_css_error_reporting(&self, pipeline_id: PipelineId, filename: String,
|
||||
line: usize, column: usize, msg: String) {
|
||||
line: u32, column: u32, msg: String) {
|
||||
let parent_page = self.root_page();
|
||||
let page = match parent_page.find(pipeline_id) {
|
||||
Some(page) => page,
|
||||
@@ -2195,7 +2188,17 @@ impl ScriptThread {
|
||||
column: column,
|
||||
msg: msg
|
||||
};
|
||||
document.report_css_error(css_error);
|
||||
|
||||
document.report_css_error(css_error.clone());
|
||||
let window = page.window();
|
||||
|
||||
if window.live_devtools_updates() {
|
||||
if let Some(ref chan) = self.devtools_chan {
|
||||
chan.send(ScriptToDevtoolsControlMsg::ReportCSSError(
|
||||
pipeline_id,
|
||||
css_error)).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user