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

Add worker scope variants to the Global enums.

Browse source
This commit is contained in:
Ms2ger 2014-07-15 19:40:55 +02:00
parent a345f413cb
commit d8152646f3
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/script/dom/bindings/global.rs
View file

@ -6,6 +6,7 @@
use dom::bindings::js::{JS, JSRef, Root}; use dom::bindings::js::{JS, JSRef, Root};
use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{Reflectable, Reflector};
use dom::workerglobalscope::WorkerGlobalScope;
use dom::window::Window; use dom::window::Window;
use page::Page; use page::Page;
use script_task::ScriptChan; use script_task::ScriptChan;
@ -16,27 +17,32 @@ use url::Url;
pub enum GlobalRef<'a> { pub enum GlobalRef<'a> {
Window(JSRef<'a, Window>), Window(JSRef<'a, Window>),
Worker(JSRef<'a, WorkerGlobalScope>),
} }
pub enum GlobalRoot<'a, 'b> { pub enum GlobalRoot<'a, 'b> {
WindowRoot(Root<'a, 'b, Window>), WindowRoot(Root<'a, 'b, Window>),
WorkerRoot(Root<'a, 'b, WorkerGlobalScope>),
} }
#[deriving(Encodable)] #[deriving(Encodable)]
pub enum GlobalField { pub enum GlobalField {
WindowField(JS<Window>), WindowField(JS<Window>),
WorkerField(JS<WorkerGlobalScope>),
} }
impl<'a> GlobalRef<'a> { impl<'a> GlobalRef<'a> {
pub fn get_cx(&self) -> *mut JSContext { pub fn get_cx(&self) -> *mut JSContext {
match *self { match *self {
Window(ref window) => window.get_cx(), Window(ref window) => window.get_cx(),
Worker(_) => fail!("NYI"),
} }
} }
pub fn as_window<'b>(&'b self) -> &'b JSRef<'b, Window> { pub fn as_window<'b>(&'b self) -> &'b JSRef<'b, Window> {
match *self { match *self {
Window(ref window) => window, Window(ref window) => window,
Worker(_) => fail!("expected a Window scope"),
} }
} }
@ -57,6 +63,7 @@ impl<'a> Reflectable for GlobalRef<'a> {
fn reflector<'b>(&'b self) -> &'b Reflector { fn reflector<'b>(&'b self) -> &'b Reflector {
match *self { match *self {
Window(ref window) => window.reflector(), Window(ref window) => window.reflector(),
Worker(ref worker) => worker.reflector(),
} }
} }
} }
@ -65,6 +72,7 @@ impl<'a, 'b> GlobalRoot<'a, 'b> {
pub fn root_ref<'c>(&'c self) -> GlobalRef<'c> { pub fn root_ref<'c>(&'c self) -> GlobalRef<'c> {
match *self { match *self {
WindowRoot(ref window) => Window(window.root_ref()), WindowRoot(ref window) => Window(window.root_ref()),
WorkerRoot(ref worker) => Worker(worker.root_ref()),
} }
} }
} }
@ -73,12 +81,14 @@ impl GlobalField {
pub fn from_rooted(global: &GlobalRef) -> GlobalField { pub fn from_rooted(global: &GlobalRef) -> GlobalField {
match *global { match *global {
Window(ref window) => WindowField(JS::from_rooted(window)), Window(ref window) => WindowField(JS::from_rooted(window)),
Worker(ref worker) => WorkerField(JS::from_rooted(worker)),
} }
} }
pub fn root(&self) -> GlobalRoot { pub fn root(&self) -> GlobalRoot {
match *self { match *self {
WindowField(ref window) => WindowRoot(window.root()), WindowField(ref window) => WindowRoot(window.root()),
WorkerField(ref worker) => WorkerRoot(worker.root()),
} }
} }
} }