Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-14 19:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rustfmt has changed its default style :/

Browse source
This commit is contained in:
Simon Sapin 2018-12-14 08:31:30 +01:00
parent 82fc6d9f49
commit be69f9c3e6
207 changed files with 1200 additions and 1339 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/script_thread.rs
View file

@ -17,8 +17,6 @@
//! a page runs its course and the script thread returns to processing events in the main event
//! loop.
use bluetooth_traits::BluetoothRequest;
use canvas_traits::webgl::WebGLPipeline;
use crate::devtools;
use crate::document_loader::DocumentLoader;
use crate::dom::bindings::cell::DomRefCell;
@ -83,6 +81,8 @@ use crate::task_source::user_interaction::UserInteractionTaskSource;
use crate::task_source::websocket::WebsocketTaskSource;
use crate::task_source::TaskSourceName;
use crate::webdriver_handlers;
use bluetooth_traits::BluetoothRequest;
use canvas_traits::webgl::WebGLPipeline;
use crossbeam_channel::{unbounded, Receiver, Sender};
use devtools_traits::CSSError;
use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo};
@ -935,7 +935,7 @@ impl ScriptThread {
return warn!(
"Paint worklet registered after pipeline {} closed.",
pipeline_id
)
);
},
};
let _ = window
@ -1192,14 +1192,16 @@ impl ScriptThread {
} else if let Some(parent) =
new_layout_info.parent_info.and_then(|pipeline_id| {
self.documents.borrow().find_document(pipeline_id)
}) {
})
{
parent.origin().clone()
} else if let Some(creator) = new_layout_info
.load_data
.creator_pipeline_id
.and_then(|pipeline_id| {
self.documents.borrow().find_document(pipeline_id)
}) {
})
{
creator.origin().clone()
} else {
MutableOrigin::new(ImmutableOrigin::new_opaque())
@ -1700,7 +1702,7 @@ impl ScriptThread {
return warn!(
"Received fire timer msg for a closed pipeline {}.",
pipeline_id
)
);
},
};
@ -1892,7 +1894,7 @@ impl ScriptThread {
return warn!(
"Set scroll state message sent to nonexistent pipeline: {:?}",
id
)
);
},
};
@ -2133,7 +2135,7 @@ impl ScriptThread {
return warn!(
"update history state after pipeline {} closed.",
pipeline_id
)
);
},
Some(window) => window.History().r().activate_state(history_state_id, url),
}
@ -2149,7 +2151,7 @@ impl ScriptThread {
return warn!(
"update history state after pipeline {} closed.",
pipeline_id
)
);
},
Some(window) => window.History().r().remove_states(history_states),
}