diff options
author | Keith Yeung <kungfukeith11@gmail.com> | 2016-12-11 03:52:08 -0800 |
---|---|---|
committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-10-19 14:12:22 +0800 |
commit | c3b17c1201441c9a24c4b272108aea0196fbf1b9 (patch) | |
tree | 0de5b1ba2b8579338ffcf5639e3e06797b9d95ff /components/script/task_source | |
parent | 605ddbecd4dfbbb67849cf63774b2d7635fc3601 (diff) | |
download | servo-c3b17c1201441c9a24c4b272108aea0196fbf1b9.tar.gz servo-c3b17c1201441c9a24c4b272108aea0196fbf1b9.zip |
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
Diffstat (limited to 'components/script/task_source')
-rw-r--r-- | components/script/task_source/mod.rs | 2 | ||||
-rw-r--r-- | components/script/task_source/port_message.rs | 45 |
2 files changed, 47 insertions, 0 deletions
diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs index f716473f88a..d315b34fcae 100644 --- a/components/script/task_source/mod.rs +++ b/components/script/task_source/mod.rs @@ -8,6 +8,7 @@ pub mod history_traversal; pub mod media_element; pub mod networking; pub mod performance_timeline; +pub mod port_message; pub mod remote_event; pub mod user_interaction; pub mod websocket; @@ -28,6 +29,7 @@ pub enum TaskSourceName { HistoryTraversal, Networking, PerformanceTimeline, + PortMessage, UserInteraction, RemoteEvent, MediaElement, diff --git a/components/script/task_source/port_message.rs b/components/script/task_source/port_message.rs new file mode 100644 index 00000000000..8541f89bc64 --- /dev/null +++ b/components/script/task_source/port_message.rs @@ -0,0 +1,45 @@ +/* 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/. */ + +use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; +use crate::task::{TaskCanceller, TaskOnce}; +use crate::task_source::{TaskSource, TaskSourceName}; +use msg::constellation_msg::PipelineId; +use std::fmt; + +#[derive(JSTraceable)] +pub struct PortMessageQueue(pub Box<ScriptChan + Send + 'static>, pub PipelineId); + +impl Clone for PortMessageQueue { + fn clone(&self) -> PortMessageQueue { + PortMessageQueue(self.0.clone(), self.1.clone()) + } +} + +impl fmt::Debug for PortMessageQueue { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "PortMessageQueue(...)") + } +} + +impl TaskSource for PortMessageQueue { + const NAME: TaskSourceName = TaskSourceName::PortMessage; + + fn queue_with_canceller<T>( + &self, + task: T, + canceller: &TaskCanceller, + ) -> Result<(), ()> + where + T: TaskOnce + 'static, + { + let msg = CommonScriptMsg::Task( + ScriptThreadEventCategory::PortMessage, + Box::new(canceller.wrap_task(task)), + Some(self.1), + Self::NAME, + ); + self.0.send(msg).map_err(|_| ()) + } +} |