diff options
author | Kunal Mohan <kunalmohan99@gmail.com> | 2020-01-04 02:22:43 +0530 |
---|---|---|
committer | Kunal Mohan <kunalmohan99@gmail.com> | 2020-01-04 02:22:43 +0530 |
commit | 0692a26bccc5cca59f2646500010d008988d74f5 (patch) | |
tree | c727c32b5e6cec5695e66d4ca00f202864ca32a6 /components/script/dom | |
parent | 3892d85fe09b39f8ff56e53a4875488fb2951dd5 (diff) | |
download | servo-0692a26bccc5cca59f2646500010d008988d74f5.tar.gz servo-0692a26bccc5cca59f2646500010d008988d74f5.zip |
Remove `origin` parameter from `Worker::handle_message`
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 3 | ||||
-rw-r--r-- | components/script/dom/worker.rs | 15 |
2 files changed, 3 insertions, 15 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 567d4fa6861..ad0e7445f0f 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -538,9 +538,8 @@ impl DedicatedWorkerGlobalScope { let worker = self.worker.borrow().as_ref().unwrap().clone(); let global_scope = self.upcast::<GlobalScope>(); let pipeline_id = global_scope.pipeline_id(); - let origin = global_scope.origin().immutable().ascii_serialization(); let task = Box::new(task!(post_worker_message: move || { - Worker::handle_message(worker, origin, data); + Worker::handle_message(worker, data); })); self.parent_sender .send(CommonScriptMsg::Task( diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 2d126933849..7eb958cd095 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -140,11 +140,7 @@ impl Worker { self.terminated.get() } - pub fn handle_message( - address: TrustedWorkerAddress, - origin: String, - data: StructuredSerializedData, - ) { + pub fn handle_message(address: TrustedWorkerAddress, data: StructuredSerializedData) { let worker = address.root(); if worker.is_terminated() { @@ -156,14 +152,7 @@ impl Worker { let _ac = enter_realm(target); rooted!(in(*global.get_cx()) let mut message = UndefinedValue()); if let Ok(ports) = structuredclone::read(&global, data, message.handle_mut()) { - MessageEvent::dispatch_jsval( - target, - &global, - message.handle(), - Some(&origin), - None, - ports, - ); + MessageEvent::dispatch_jsval(target, &global, message.handle(), None, None, ports); } else { // Step 4 of the "port post message steps" of the implicit messageport, fire messageerror. MessageEvent::dispatch_error(target, &global); |