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

Remove GlobalRef::get_worker_id

Browse source
This commit is contained in:
Anthony Ramine 2016-10-02 01:19:14 +02:00
parent 522734de22
commit e2dfcb658b
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/bindings/global.rs
View file

@ -140,14 +140,6 @@ impl<'a> GlobalRef<'a> {
self.resource_threads().sender() self.resource_threads().sender()
} }
/// Get the worker's id.
pub fn get_worker_id(&self) -> Option<WorkerId> {
match *self {
GlobalRef::Window(_) => None,
GlobalRef::Worker(ref worker) => Some(worker.get_worker_id()),
}
}
/// Get next worker id. /// Get next worker id.
pub fn get_next_worker_id(&self) -> WorkerId { pub fn get_next_worker_id(&self) -> WorkerId {
match *self { match *self {

7
components/script/dom/console.rs
View file

@ -17,10 +17,15 @@ impl Console {
fn send_to_devtools(global: GlobalRef, level: LogLevel, message: DOMString) { fn send_to_devtools(global: GlobalRef, level: LogLevel, message: DOMString) {
if let Some(chan) = global.devtools_chan() { if let Some(chan) = global.devtools_chan() {
let console_message = prepare_message(level, message); let console_message = prepare_message(level, message);
let worker_id = if let GlobalRef::Worker(worker) = global {
Some(worker.get_worker_id())
} else {
None
};
let devtools_message = ScriptToDevtoolsControlMsg::ConsoleAPI( let devtools_message = ScriptToDevtoolsControlMsg::ConsoleAPI(
global.pipeline_id(), global.pipeline_id(),
console_message, console_message,
global.get_worker_id()); worker_id);
chan.send(devtools_message).unwrap(); chan.send(devtools_message).unwrap();
} }
} }