diff options
author | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-09-01 03:18:42 +0800 |
---|---|---|
committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2019-12-11 22:46:50 +0800 |
commit | 6e8a85482c2068d4dbccb992954271f725570f91 (patch) | |
tree | b30f6d82a018df0b196fa4d47d3b6667d708313e /components/script_traits/lib.rs | |
parent | 7aa68c8fe7ca0865a7323ab1e5b9526efa588ca2 (diff) | |
download | servo-6e8a85482c2068d4dbccb992954271f725570f91.tar.gz servo-6e8a85482c2068d4dbccb992954271f725570f91.zip |
re-structure blob, structured serialization
Diffstat (limited to 'components/script_traits/lib.rs')
-rw-r--r-- | components/script_traits/lib.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 13429a13251..440a412a979 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -17,9 +17,11 @@ extern crate malloc_size_of_derive; extern crate serde; mod script_msg; +pub mod serializable; pub mod transferable; pub mod webdriver_msg; +use crate::serializable::BlobImpl; use crate::transferable::MessagePortImpl; use crate::webdriver_msg::{LoadStatus, WebDriverScriptCommand}; use bluetooth_traits::BluetoothRequest; @@ -39,7 +41,9 @@ use libc::c_void; use log::warn; use media::WindowGLContext; use msg::constellation_msg::BackgroundHangMonitorRegister; -use msg::constellation_msg::{BrowsingContextId, HistoryStateId, MessagePortId, PipelineId}; +use msg::constellation_msg::{ + BlobId, BrowsingContextId, HistoryStateId, MessagePortId, PipelineId, +}; use msg::constellation_msg::{PipelineNamespaceId, TopLevelBrowsingContextId, TraversalDirection}; use net_traits::image::base::Image; use net_traits::image_cache::ImageCache; @@ -1039,6 +1043,8 @@ impl ScriptToConstellationChan { pub struct StructuredSerializedData { /// Data serialized by SpiderMonkey. pub serialized: Vec<u8>, + /// Serialized in a structured callback, + pub blobs: Option<HashMap<BlobId, BlobImpl>>, /// Transferred objects. pub ports: Option<HashMap<MessagePortId, MessagePortImpl>>, } |