aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/worker.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-09-27 13:16:41 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-06 20:59:09 +0200
commitfcb59d305742a18daa083352a9b6e9a45896c9f6 (patch)
treed1023c24bfb5827c49d4d4653a72541b66532b95 /components/script/dom/worker.rs
parent093b189b4800909b17295b88aed762601f4b8482 (diff)
downloadservo-fcb59d305742a18daa083352a9b6e9a45896c9f6.tar.gz
servo-fcb59d305742a18daa083352a9b6e9a45896c9f6.zip
Make reflect_dom_object take a &GlobalScope
Diffstat (limited to 'components/script/dom/worker.rs')
-rw-r--r--components/script/dom/worker.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index fb6b170ab1d..9c43f1c148d 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -21,6 +21,7 @@ use dom::errorevent::ErrorEvent;
use dom::event::{Event, EventBubbles, EventCancelable};
use dom::eventdispatcher::EventStatus;
use dom::eventtarget::EventTarget;
+use dom::globalscope::GlobalScope;
use dom::messageevent::MessageEvent;
use dom::workerglobalscope::prepare_workerscope_init;
use ipc_channel::ipc;
@@ -61,7 +62,7 @@ impl Worker {
}
}
- pub fn new(global: GlobalRef,
+ pub fn new(global: &GlobalScope,
sender: Sender<(TrustedWorkerAddress, WorkerScriptMsg)>,
closing: Arc<AtomicBool>) -> Root<Worker> {
reflect_dom_object(box Worker::new_inherited(sender, closing),
@@ -80,7 +81,7 @@ impl Worker {
let (sender, receiver) = channel();
let closing = Arc::new(AtomicBool::new(false));
- let worker = Worker::new(global, sender.clone(), closing.clone());
+ let worker = Worker::new(global.as_global_scope(), sender.clone(), closing.clone());
let worker_ref = Trusted::new(worker.r());
let worker_load_origin = WorkerScriptLoadOrigin {
@@ -144,7 +145,7 @@ impl Worker {
#[allow(unsafe_code)]
fn dispatch_error(&self, error_info: ErrorInfo) {
let global = self.global();
- let event = ErrorEvent::new(global.r(),
+ let event = ErrorEvent::new(global.r().as_global_scope(),
atom!("error"),
EventBubbles::DoesNotBubble,
EventCancelable::Cancelable,