Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Runtime in WorkerGlobalScope and DedicatedWorkerGlobalScope.

Browse source
This commit is contained in:
Ms2ger 2015-05-10 16:33:47 +02:00
parent 4ed94629a2
commit 0f495afda6
2 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/script/dom/workerglobalscope.rs
View file

@ -27,10 +27,9 @@ use util::str::DOMString;
use js::jsapi::JSContext;
use js::jsval::JSVal;
use js::rust::Cx;
use js::rust::Runtime;
use std::default::Default;
use std::rc::Rc;
use std::cell::Cell;
use url::{Url, UrlParser};
@ -45,7 +44,7 @@ pub enum WorkerGlobalScopeTypeId {
pub struct WorkerGlobalScope {
eventtarget: EventTarget,
worker_url: Url,
js_context: Rc<Cx>,
runtime: Runtime,
next_worker_id: Cell<WorkerId>,
resource_task: ResourceTask,
location: MutNullableHeap<JS<WorkerLocation>>,
@ -58,14 +57,14 @@ pub struct WorkerGlobalScope {
impl WorkerGlobalScope {
pub fn new_inherited(type_id: WorkerGlobalScopeTypeId,
worker_url: Url,
cx: Rc<Cx>,
runtime: Runtime,
resource_task: ResourceTask,
devtools_chan: Option<DevtoolsControlChan>) -> WorkerGlobalScope {
WorkerGlobalScope {
eventtarget: EventTarget::new_inherited(EventTargetTypeId::WorkerGlobalScope(type_id)),
next_worker_id: Cell::new(WorkerId(0)),
worker_url: worker_url,
js_context: cx,
runtime: runtime,
resource_task: resource_task,
location: Default::default(),
navigator: Default::default(),
@ -85,7 +84,7 @@ impl WorkerGlobalScope {
}
pub fn get_cx(&self) -> *mut JSContext {
self.js_context.ptr
self.runtime.cx()
}
pub fn resource_task<'a>(&'a self) -> &'a ResourceTask {
@ -137,7 +136,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
}
};
match self.js_context.evaluate_script(
match self.runtime.cx.evaluate_script(
self.reflector().get_jsobject(), source, url.serialize(), 1) {
Ok(_) => (),
Err(_) => {
@ -263,7 +262,7 @@ impl<'a> WorkerGlobalScopeHelpers for JSRef<'a, WorkerGlobalScope> {
}
fn get_cx(self) -> *mut JSContext {
self.js_context.ptr
self.runtime.cx()
}
}