aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/console.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-01-09 16:02:41 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2016-01-09 16:02:41 +0100
commit0e3f066e8a971b1d90a07b4448e12a57c34b114c (patch)
tree2704ec6a97cbad416f1400c5f959e3dc017ab6aa /components/script/dom/console.rs
parentf00532bab0382d1c24e6086314f26497fb6ffe0f (diff)
downloadservo-0e3f066e8a971b1d90a07b4448e12a57c34b114c.tar.gz
servo-0e3f066e8a971b1d90a07b4448e12a57c34b114c.zip
Remove the global field from Console
We can just go through the reflector.
Diffstat (limited to 'components/script/dom/console.rs')
-rw-r--r--components/script/dom/console.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index c19855b76ff..8d5769afcd2 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -5,7 +5,7 @@
use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg};
use dom::bindings::codegen::Bindings::ConsoleBinding;
use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods;
-use dom::bindings::global::{GlobalField, GlobalRef};
+use dom::bindings::global::{GlobalRef, global_root_from_reflector};
use dom::bindings::js::Root;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use util::str::DOMString;
@@ -14,19 +14,17 @@ use util::str::DOMString;
#[dom_struct]
pub struct Console {
reflector_: Reflector,
- global: GlobalField,
}
impl Console {
- fn new_inherited(global: GlobalRef) -> Console {
+ fn new_inherited() -> Console {
Console {
reflector_: Reflector::new(),
- global: GlobalField::from_rooted(&global),
}
}
pub fn new(global: GlobalRef) -> Root<Console> {
- reflect_dom_object(box Console::new_inherited(global),
+ reflect_dom_object(box Console::new_inherited(),
global,
ConsoleBinding::Wrap)
}
@@ -95,7 +93,7 @@ fn prepare_message(logLevel: LogLevel, message: DOMString) -> ConsoleMessage {
}
fn propagate_console_msg(console: &&Console, console_message: ConsoleMessage) {
- let global = console.global.root();
+ let global = global_root_from_reflector(*console);
let pipelineId = global.r().pipeline();
global.r().devtools_chan().as_ref().map(|chan| {
chan.send(ScriptToDevtoolsControlMsg::ConsoleAPI(pipelineId,