From c5fe2351124c673d1dc4d59355a03654b4fcc541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= Date: Wed, 23 Aug 2017 14:10:08 +0200 Subject: order derivable traits lists Ignoring : - **generated**.rs - python/tidy/servo_tidy_tests/rust_tidy.rs --- components/script/dom/abstractworker.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 8d92680fbed..fec71495613 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -29,7 +29,7 @@ impl SimpleWorkerErrorHandler { } } -#[derive(Copy, Clone)] +#[derive(Clone, Copy)] pub struct SharedRt { rt: *mut JSRuntime } -- cgit v1.2.3 From 74c1e00d8163f255bb4141ff3549bbdedd7ea766 Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Fri, 1 Jun 2018 17:24:25 -0500 Subject: Upgraded to SM 60 --- components/script/dom/abstractworker.rs | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index fec71495613..9a72316810b 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -5,8 +5,6 @@ use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::DomObject; use dom::bindings::structuredclone::StructuredCloneData; -use js::jsapi::{JSRuntime, JS_RequestInterruptCallback}; -use js::rust::Runtime; use script_runtime::CommonScriptMsg; /// Messages used to control the worker event loops @@ -28,25 +26,3 @@ impl SimpleWorkerErrorHandler { } } } - -#[derive(Clone, Copy)] -pub struct SharedRt { - rt: *mut JSRuntime -} - -impl SharedRt { - pub fn new(rt: &Runtime) -> SharedRt { - SharedRt { - rt: rt.rt() - } - } - - #[allow(unsafe_code)] - pub fn request_interrupt(&self) { - unsafe { - JS_RequestInterruptCallback(self.rt); - } - } -} -#[allow(unsafe_code)] -unsafe impl Send for SharedRt {} -- cgit v1.2.3 From c37a345dc9f4dda6ea29c42f96f6c7201c42cbac Mon Sep 17 00:00:00 2001 From: chansuke Date: Tue, 18 Sep 2018 23:24:15 +0900 Subject: Format script component --- components/script/dom/abstractworker.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 9a72316810b..2038ff62476 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -12,7 +12,7 @@ pub enum WorkerScriptMsg { /// Common variants associated with the script messages Common(CommonScriptMsg), /// Message sent through Worker.postMessage - DOMMessage(StructuredCloneData) + DOMMessage(StructuredCloneData), } pub struct SimpleWorkerErrorHandler { @@ -21,8 +21,6 @@ pub struct SimpleWorkerErrorHandler { impl SimpleWorkerErrorHandler { pub fn new(addr: Trusted) -> SimpleWorkerErrorHandler { - SimpleWorkerErrorHandler { - addr: addr - } + SimpleWorkerErrorHandler { addr: addr } } } -- cgit v1.2.3 From 45f7199eee82c66637ec68287eafa40a651001c4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 1 Nov 2018 23:45:06 +0100 Subject: `cargo fix --edition` --- components/script/dom/abstractworker.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 2038ff62476..05b120a5284 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::refcounted::Trusted; -use dom::bindings::reflector::DomObject; -use dom::bindings::structuredclone::StructuredCloneData; -use script_runtime::CommonScriptMsg; +use crate::dom::bindings::refcounted::Trusted; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::bindings::structuredclone::StructuredCloneData; +use crate::script_runtime::CommonScriptMsg; /// Messages used to control the worker event loops pub enum WorkerScriptMsg { -- cgit v1.2.3 From a1a14459c141afc6ac6771b8a6c9ca374537edf2 Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Mon, 19 Nov 2018 14:47:12 +0100 Subject: Update MPL license to https (part 3) --- components/script/dom/abstractworker.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 05b120a5284..8754bb30d96 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::refcounted::Trusted; use crate::dom::bindings::reflector::DomObject; -- cgit v1.2.3 From c3b17c1201441c9a24c4b272108aea0196fbf1b9 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Sun, 11 Dec 2016 03:52:08 -0800 Subject: begin messageport, transferable objects, impl Accept transfer argument for StructuredCloneData::write Allow structured clone reads to return a boolean Add Transferable trait Add basic skeletons to MessagePort Implement transfer and transfer-receiving steps on MessagePort Use transfer and transfer_receive in StructuredClone callbacks Implement MessageChannel Freeze the array object for the MessageEvent ports attribute Implement transfer argument on window.postMessage Use ReentrantMutex instead for MessagePortInternal Accept origin as a parameter in dispatch_jsval Fix BorrowMut crash with pending_port_message Detach port on closure and check for detached during transfer Enable webmessaging tests fix webidl fix --- components/script/dom/abstractworker.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 8754bb30d96..930f48cdcea 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -12,7 +12,10 @@ pub enum WorkerScriptMsg { /// Common variants associated with the script messages Common(CommonScriptMsg), /// Message sent through Worker.postMessage - DOMMessage(StructuredCloneData), + DOMMessage { + origin: String, + data: StructuredCloneData, + } } pub struct SimpleWorkerErrorHandler { -- cgit v1.2.3 From 2f8932a6a1e2666567435114383b3acd1899aca7 Mon Sep 17 00:00:00 2001 From: Gregory Terzian Date: Wed, 26 Jun 2019 00:25:48 +0800 Subject: continue messageport, transferable, postmessage options --- components/script/dom/abstractworker.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'components/script/dom/abstractworker.rs') diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index 930f48cdcea..36ff18fe01b 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -4,8 +4,9 @@ use crate::dom::bindings::refcounted::Trusted; use crate::dom::bindings::reflector::DomObject; -use crate::dom::bindings::structuredclone::StructuredCloneData; use crate::script_runtime::CommonScriptMsg; +use script_traits::StructuredSerializedData; +use servo_url::ImmutableOrigin; /// Messages used to control the worker event loops pub enum WorkerScriptMsg { @@ -13,9 +14,9 @@ pub enum WorkerScriptMsg { Common(CommonScriptMsg), /// Message sent through Worker.postMessage DOMMessage { - origin: String, - data: StructuredCloneData, - } + origin: ImmutableOrigin, + data: StructuredSerializedData, + }, } pub struct SimpleWorkerErrorHandler { -- cgit v1.2.3