diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 9cae8b597dc..bc4a34eeb1b 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -283,7 +283,7 @@ impl DedicatedWorkerGlobalScope { scope.reflector().get_jsobject().get()); rooted!(in(scope.get_cx()) let mut message = UndefinedValue()); data.read(scope.upcast(), message.handle_mut()); - MessageEvent::dispatch_jsval(target, GlobalRef::Worker(scope), message.handle()); + MessageEvent::dispatch_jsval(target, scope.upcast(), message.handle()); }, WorkerScriptMsg::Common(CommonScriptMsg::RunnableMsg(_, runnable)) => { runnable.handler() diff --git a/components/script/dom/extendablemessageevent.rs b/components/script/dom/extendablemessageevent.rs index a0d8b3cf76b..8acddbaf7fa 100644 --- a/components/script/dom/extendablemessageevent.rs +++ b/components/script/dom/extendablemessageevent.rs @@ -65,10 +65,10 @@ impl ExtendableMessageEvent { impl ExtendableMessageEvent { pub fn dispatch_jsval(target: &EventTarget, - scope: GlobalRef, + scope: &GlobalScope, message: HandleValue) { let Extendablemessageevent = ExtendableMessageEvent::new( - scope.as_global_scope(), atom!("message"), false, false, message, + scope, atom!("message"), false, false, message, DOMString::new(), DOMString::new()); Extendablemessageevent.upcast::().fire(target); } diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 62c8c4c5ed4..8192c8301cf 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -81,10 +81,10 @@ impl MessageEvent { impl MessageEvent { pub fn dispatch_jsval(target: &EventTarget, - scope: GlobalRef, + scope: &GlobalScope, message: HandleValue) { let messageevent = MessageEvent::new( - scope.as_global_scope(), + scope, atom!("message"), false, false, diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index 98380eaa193..52cfbff5bff 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -239,7 +239,7 @@ impl ServiceWorkerGlobalScope { let _ac = JSAutoCompartment::new(scope.get_cx(), scope.reflector().get_jsobject().get()); rooted!(in(scope.get_cx()) let mut message = UndefinedValue()); data.read(scope.upcast(), message.handle_mut()); - ExtendableMessageEvent::dispatch_jsval(target, GlobalRef::Worker(scope), message.handle()); + ExtendableMessageEvent::dispatch_jsval(target, scope.upcast(), message.handle()); }, CommonWorker(WorkerScriptMsg::Common(CommonScriptMsg::RunnableMsg(_, runnable))) => { runnable.handler() diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index a7bf55b6757..bbdc6a1c9b5 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -587,10 +587,10 @@ impl Runnable for MessageReceivedTask { } // Step 2-5. - let global = ws.r().global(); + let global = ws.global_scope(); // global.get_cx() returns a valid `JSContext` pointer, so this is safe. unsafe { - let cx = global.r().get_cx(); + let cx = global.get_cx(); let _ac = JSAutoCompartment::new(cx, ws.reflector().get_jsobject().get()); rooted!(in(cx) let mut message = UndefinedValue()); match self.message { @@ -598,10 +598,7 @@ impl Runnable for MessageReceivedTask { MessageData::Binary(data) => { match ws.binary_type.get() { BinaryType::Blob => { - let blob = Blob::new( - global.r().as_global_scope(), - BlobImpl::new_from_bytes(data), - "".to_owned()); + let blob = Blob::new(&global, BlobImpl::new_from_bytes(data), "".to_owned()); blob.to_jsval(cx, message.handle_mut()); } BinaryType::Arraybuffer => { @@ -617,7 +614,7 @@ impl Runnable for MessageReceivedTask { } }, } - MessageEvent::dispatch_jsval(ws.upcast(), global.r(), message.handle()); + MessageEvent::dispatch_jsval(ws.upcast(), &global, message.handle()); } } } diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 137a46275b1..f5b021feea6 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1776,7 +1776,7 @@ impl Runnable for PostMessageHandler { // Step 11-12. // TODO(#12719): set the other attributes. MessageEvent::dispatch_jsval(window.upcast(), - GlobalRef::Window(&*window), + window.upcast(), message.handle()); } } diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index b959be94354..9b8f3200878 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -130,12 +130,12 @@ impl Worker { return; } - let global = worker.r().global(); + let global = worker.global_scope(); let target = worker.upcast(); - let _ac = JSAutoCompartment::new(global.r().get_cx(), target.reflector().get_jsobject().get()); - rooted!(in(global.r().get_cx()) let mut message = UndefinedValue()); - data.read(global.r().as_global_scope(), message.handle_mut()); - MessageEvent::dispatch_jsval(target, global.r(), message.handle()); + let _ac = JSAutoCompartment::new(global.get_cx(), target.reflector().get_jsobject().get()); + rooted!(in(global.get_cx()) let mut message = UndefinedValue()); + data.read(&global, message.handle_mut()); + MessageEvent::dispatch_jsval(target, &global, message.handle()); } pub fn dispatch_simple_error(address: TrustedWorkerAddress) {