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

Remove origin parameter from Worker::handle_message

Browse source
This commit is contained in:
Kunal Mohan 2020-01-04 02:22:43 +05:30
parent 3892d85fe0
commit 0692a26bcc
No known key found for this signature in database
GPG key ID: 2B475A4524237BAC
3 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -538,9 +538,8 @@ impl DedicatedWorkerGlobalScope {
let worker = self.worker.borrow().as_ref().unwrap().clone(); let worker = self.worker.borrow().as_ref().unwrap().clone();
let global_scope = self.upcast::<GlobalScope>(); let global_scope = self.upcast::<GlobalScope>();
let pipeline_id = global_scope.pipeline_id(); let pipeline_id = global_scope.pipeline_id();
let origin = global_scope.origin().immutable().ascii_serialization();
let task = Box::new(task!(post_worker_message: move || { let task = Box::new(task!(post_worker_message: move || {
Worker::handle_message(worker, origin, data); Worker::handle_message(worker, data);
})); }));
self.parent_sender self.parent_sender
.send(CommonScriptMsg::Task( .send(CommonScriptMsg::Task(

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

@ -140,11 +140,7 @@ impl Worker {
self.terminated.get() self.terminated.get()
} }
pub fn handle_message( pub fn handle_message(address: TrustedWorkerAddress, data: StructuredSerializedData) {
address: TrustedWorkerAddress,
origin: String,
data: StructuredSerializedData,
) {
let worker = address.root(); let worker = address.root();
if worker.is_terminated() { if worker.is_terminated() {
@ -156,14 +152,7 @@ impl Worker {
let _ac = enter_realm(target); let _ac = enter_realm(target);
rooted!(in(*global.get_cx()) let mut message = UndefinedValue()); rooted!(in(*global.get_cx()) let mut message = UndefinedValue());
if let Ok(ports) = structuredclone::read(&global, data, message.handle_mut()) { if let Ok(ports) = structuredclone::read(&global, data, message.handle_mut()) {
MessageEvent::dispatch_jsval( MessageEvent::dispatch_jsval(target, &global, message.handle(), None, None, ports);
target,
&global,
message.handle(),
Some(&origin),
None,
ports,
);
} else { } else {
// Step 4 of the "port post message steps" of the implicit messageport, fire messageerror. // Step 4 of the "port post message steps" of the implicit messageport, fire messageerror.
MessageEvent::dispatch_error(target, &global); MessageEvent::dispatch_error(target, &global);

5
tests/wpt/metadata/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html.ini
View file

@ -1,5 +0,0 @@
[message-event.html]
type: testharness
[Properties of the 'message' event]
expected: FAIL