Implement global.console in workers.

This commit is contained in:
Ms2ger 2014-07-15 19:25:34 +02:00
parent 3074b4747a
commit 747bfc6f15
2 changed files with 23 additions and 0 deletions

View file

@ -25,3 +25,9 @@ partial interface WorkerGlobalScope {
}; };
//WorkerGlobalScope implements WindowTimers; //WorkerGlobalScope implements WindowTimers;
//WorkerGlobalScope implements WindowBase64; //WorkerGlobalScope implements WindowBase64;
// Proprietary
partial interface WorkerGlobalScope {
[Replaceable]
readonly attribute Console console;
};

View file

@ -3,12 +3,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::trace::Untraceable; use dom::bindings::trace::Untraceable;
use dom::bindings::global;
use dom::bindings::js::{JS, JSRef, Temporary, OptionalSettable};
use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{Reflectable, Reflector};
use dom::console::Console;
use dom::eventtarget::{EventTarget, WorkerGlobalScopeTypeId}; use dom::eventtarget::{EventTarget, WorkerGlobalScopeTypeId};
use js::jsapi::JSContext; use js::jsapi::JSContext;
use js::rust::Cx; use js::rust::Cx;
use std::cell::Cell;
use std::rc::Rc; use std::rc::Rc;
#[deriving(PartialEq,Encodable)] #[deriving(PartialEq,Encodable)]
@ -20,6 +24,7 @@ pub enum WorkerGlobalScopeId {
pub struct WorkerGlobalScope { pub struct WorkerGlobalScope {
pub eventtarget: EventTarget, pub eventtarget: EventTarget,
js_context: Untraceable<Rc<Cx>>, js_context: Untraceable<Rc<Cx>>,
console: Cell<Option<JS<Console>>>,
} }
impl WorkerGlobalScope { impl WorkerGlobalScope {
@ -28,6 +33,7 @@ impl WorkerGlobalScope {
WorkerGlobalScope { WorkerGlobalScope {
eventtarget: EventTarget::new_inherited(WorkerGlobalScopeTypeId(type_id)), eventtarget: EventTarget::new_inherited(WorkerGlobalScopeTypeId(type_id)),
js_context: Untraceable::new(cx), js_context: Untraceable::new(cx),
console: Cell::new(None),
} }
} }
@ -40,6 +46,17 @@ impl WorkerGlobalScope {
} }
pub trait WorkerGlobalScopeMethods { pub trait WorkerGlobalScopeMethods {
fn Console(&self) -> Temporary<Console>;
}
impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
fn Console(&self) -> Temporary<Console> {
if self.console.get().is_none() {
let console = Console::new(&global::Worker(*self));
self.console.assign(Some(console));
}
Temporary::new(self.console.get().get_ref().clone())
}
} }
impl Reflectable for WorkerGlobalScope { impl Reflectable for WorkerGlobalScope {