Move CSSErrorReporter to script_layout_interface.

components/script/dom/bindings/trace.rs

@@ -67,6 +67,7 @@ use offscreen_gl_context::GLLimits;
 use profile_traits::mem::ProfilerChan as MemProfilerChan;
 use profile_traits::time::ProfilerChan as TimeProfilerChan;
 use script_layout_interface::OpaqueStyleAndLayoutData;
+use script_layout_interface::reporter::CSSErrorReporter;
 use script_layout_interface::rpc::LayoutRPC;
 use script_runtime::ScriptChan;
 use script_traits::{TimerEventId, TimerSource, TouchpadPressurePhase, UntrustedNodeAddress};
@@ -330,6 +331,7 @@ no_jsmanaged_fields!(ResourceThreads);
 no_jsmanaged_fields!(SystemTime);
 no_jsmanaged_fields!(SelectedFileId);
 no_jsmanaged_fields!(OpaqueStyleAndLayoutData);
+no_jsmanaged_fields!(CSSErrorReporter);
 
 impl JSTraceable for Box<ScriptChan + Send> {
     #[inline]

components/script/dom/window.rs

@@ -55,10 +55,10 @@ use open;
 use profile_traits::mem;
 use profile_traits::time::{ProfilerCategory, TimerMetadata, TimerMetadataFrameType};
 use profile_traits::time::{ProfilerChan, TimerMetadataReflowType, profile};
-use reporter::CSSErrorReporter;
 use rustc_serialize::base64::{FromBase64, STANDARD, ToBase64};
 use script_layout_interface::TrustedNodeAddress;
 use script_layout_interface::message::{Msg, Reflow, ReflowQueryType, ScriptReflow};
+use script_layout_interface::reporter::CSSErrorReporter;
 use script_layout_interface::rpc::{ContentBoxResponse, ContentBoxesResponse, LayoutRPC};
 use script_layout_interface::rpc::{MarginStyleResponse, ResolvedStyleResponse};
 use script_runtime::{ScriptChan, ScriptPort};

components/script/lib.rs

@@ -99,7 +99,6 @@ mod mem;
 mod network_listener;
 pub mod origin;
 pub mod parse;
-pub mod reporter;
 pub mod script_runtime;
 #[allow(unsafe_code)]
 pub mod script_thread;

components/script/reporter.rs

@@ -1,44 +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 http://mozilla.org/MPL/2.0/. */
-
-use cssparser::{Parser, SourcePosition};
-use ipc_channel::ipc::IpcSender;
-use log;
-use msg::constellation_msg::PipelineId;
-use script_traits::ConstellationControlMsg;
-use std::sync::{Mutex, Arc};
-use style::error_reporting::ParseErrorReporter;
-
-#[derive(JSTraceable, HeapSizeOf)]
-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_heap_size_of = "Arc is defined in libstd"]
-    pub script_chan: Arc<Mutex<IpcSender<ConstellationControlMsg>>>,
-}
-
-impl ParseErrorReporter for CSSErrorReporter {
-     fn report_error(&self, input: &mut Parser, position: SourcePosition, message: &str) {
-         let location = input.source_location(position);
-         if log_enabled!(log::LogLevel::Info) {
-             info!("{}:{} {}", location.line, location.column, message)
-         }
-         //TODO: report a real filename
-         let _ = self.script_chan.lock().unwrap().send(
-             ConstellationControlMsg::ReportCSSError(self.pipelineid,
-                                                     "".to_owned(),
-                                                     location.line,
-                                                     location.column,
-                                                     message.to_owned()));
-     }
-
-     fn clone(&self) -> Box<ParseErrorReporter + Send + Sync> {
-         box CSSErrorReporter {
-             pipelineid: self.pipelineid,
-             script_chan: self.script_chan.clone(),
-         }
-     }
-}