aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-10-02 01:19:14 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-04 13:58:26 +0200
commite2dfcb658b1a837f5bd1dc8ea36d92fe401608ad (patch)
tree2a4098af5e7f4e48394e47dd2f2e6421a31df5e6
parent522734de22ddbbc256cad94d1f07a8149e6e58fa (diff)
downloadservo-e2dfcb658b1a837f5bd1dc8ea36d92fe401608ad.tar.gz
servo-e2dfcb658b1a837f5bd1dc8ea36d92fe401608ad.zip
Remove GlobalRef::get_worker_id
-rw-r--r--components/script/dom/bindings/global.rs8
-rw-r--r--components/script/dom/console.rs7
2 files changed, 6 insertions, 9 deletions
diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index 5d679cce2e9..8905abb79f7 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -140,14 +140,6 @@ impl<'a> GlobalRef<'a> {
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.
pub fn get_next_worker_id(&self) -> WorkerId {
match *self {
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index 05bd5e558b8..ad28c585248 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -17,10 +17,15 @@ impl Console {
fn send_to_devtools(global: GlobalRef, level: LogLevel, message: DOMString) {
if let Some(chan) = global.devtools_chan() {
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(
global.pipeline_id(),
console_message,
- global.get_worker_id());
+ worker_id);
chan.send(devtools_message).unwrap();
}
}