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

Remove the global field from Console

Browse source 
We can just go through the reflector.
This commit is contained in:
Anthony Ramine 2016-01-09 16:02:41 +01:00
parent f00532bab0
commit 0e3f066e8a
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@
use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg}; use devtools_traits::{ConsoleMessage, LogLevel, ScriptToDevtoolsControlMsg};
use dom::bindings::codegen::Bindings::ConsoleBinding; use dom::bindings::codegen::Bindings::ConsoleBinding;
use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods; 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::js::Root;
use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::reflector::{Reflector, reflect_dom_object};
use util::str::DOMString; use util::str::DOMString;
@ -14,19 +14,17 @@ use util::str::DOMString;
#[dom_struct] #[dom_struct]
pub struct Console { pub struct Console {
reflector_: Reflector, reflector_: Reflector,
global: GlobalField,
} }
impl Console { impl Console {
fn new_inherited(global: GlobalRef) -> Console { fn new_inherited() -> Console {
Console { Console {
reflector_: Reflector::new(), reflector_: Reflector::new(),
global: GlobalField::from_rooted(&global),
} }
} }
pub fn new(global: GlobalRef) -> Root<Console> { pub fn new(global: GlobalRef) -> Root<Console> {
reflect_dom_object(box Console::new_inherited(global), reflect_dom_object(box Console::new_inherited(),
global, global,
ConsoleBinding::Wrap) ConsoleBinding::Wrap)
} }
@ -95,7 +93,7 @@ fn prepare_message(logLevel: LogLevel, message: DOMString) -> ConsoleMessage {
} }
fn propagate_console_msg(console: &&Console, console_message: 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(); let pipelineId = global.r().pipeline();
global.r().devtools_chan().as_ref().map(|chan| { global.r().devtools_chan().as_ref().map(|chan| {
chan.send(ScriptToDevtoolsControlMsg::ConsoleAPI(pipelineId, chan.send(ScriptToDevtoolsControlMsg::ConsoleAPI(pipelineId,