Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stop storing CSS errors on the Document.

Browse source 
They are never read.
This commit is contained in:
Ms2ger 2016-05-24 14:41:38 +02:00
parent e18bf81905
commit a5139787de
2 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/document.rs
View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use devtools_traits::CSSError;
use document_loader::{DocumentLoader, LoadType}; use document_loader::{DocumentLoader, LoadType};
use dom::activation::{ActivationSource, synthetic_click_activation}; use dom::activation::{ActivationSource, synthetic_click_activation};
use dom::attr::{Attr, AttrValue}; use dom::attr::{Attr, AttrValue};
@ -232,8 +231,6 @@ pub struct Document {
dom_complete: Cell<u64>, dom_complete: Cell<u64>,
load_event_start: Cell<u64>, load_event_start: Cell<u64>,
load_event_end: Cell<u64>, load_event_end: Cell<u64>,
/// Vector to store CSS errors
css_errors_store: DOMRefCell<Vec<CSSError>>,
/// https://html.spec.whatwg.org/multipage/#concept-document-https-state /// https://html.spec.whatwg.org/multipage/#concept-document-https-state
https_state: Cell<HttpsState>, https_state: Cell<HttpsState>,
touchpad_pressure_phase: Cell<TouchpadPressurePhase>, touchpad_pressure_phase: Cell<TouchpadPressurePhase>,
@ -332,10 +329,6 @@ impl Document {
self.trigger_mozbrowser_event(MozBrowserEvent::SecurityChange(https_state)); self.trigger_mozbrowser_event(MozBrowserEvent::SecurityChange(https_state));
} }
pub fn report_css_error(&self, css_error: CSSError) {
self.css_errors_store.borrow_mut().push(css_error);
}
// https://html.spec.whatwg.org/multipage/#fully-active // https://html.spec.whatwg.org/multipage/#fully-active
pub fn is_fully_active(&self) -> bool { pub fn is_fully_active(&self) -> bool {
let browsing_context = match self.browsing_context() { let browsing_context = match self.browsing_context() {
@ -1705,7 +1698,6 @@ impl Document {
dom_complete: Cell::new(Default::default()), dom_complete: Cell::new(Default::default()),
load_event_start: Cell::new(Default::default()), load_event_start: Cell::new(Default::default()),
load_event_end: Cell::new(Default::default()), load_event_end: Cell::new(Default::default()),
css_errors_store: DOMRefCell::new(vec![]),
https_state: Cell::new(HttpsState::None), https_state: Cell::new(HttpsState::None),
touchpad_pressure_phase: Cell::new(TouchpadPressurePhase::BeforeClick), touchpad_pressure_phase: Cell::new(TouchpadPressurePhase::BeforeClick),
origin: origin, origin: origin,

28
components/script/script_thread.rs
View file

@ -1971,29 +1971,27 @@ impl ScriptThread {
fn handle_css_error_reporting(&self, pipeline_id: PipelineId, filename: String, fn handle_css_error_reporting(&self, pipeline_id: PipelineId, filename: String,
line: usize, column: usize, msg: String) { line: usize, column: usize, msg: String) {
let sender = match self.devtools_chan {
Some(ref sender) => sender,
None => return,
};
let parent_context = self.root_browsing_context(); let parent_context = self.root_browsing_context();
let context = match parent_context.find(pipeline_id) { let context = match parent_context.find(pipeline_id) {
Some(context) => context, Some(context) => context,
None => return, None => return,
}; };
let document = context.active_document();
let css_error = CSSError {
filename: filename,
line: line,
column: column,
msg: msg
};
document.report_css_error(css_error.clone());
let window = context.active_window(); let window = context.active_window();
if window.live_devtools_updates() { if window.live_devtools_updates() {
if let Some(ref chan) = self.devtools_chan { let css_error = CSSError {
chan.send(ScriptToDevtoolsControlMsg::ReportCSSError( filename: filename,
pipeline_id, line: line,
css_error)).unwrap(); column: column,
} msg: msg
};
let message = ScriptToDevtoolsControlMsg::ReportCSSError(pipeline_id, css_error);
sender.send(message).unwrap();
} }
} }
} }