mirror of
https://github.com/servo/servo.git
synced 2025-08-08 06:55:31 +01:00
Reduce indexing boilerplate for serializable/transferrable objects. (#36624)
Rather than creating unique types for each pipeline-namespaced index type (eg. MessagePortId, DomExceptionId, etc.), we can create a generic common type that uses a marker to prevent type confusion. This change allows us to reduce the boilerplate code required when implementing serializable/transferable interfaces, since the structured clone implementation can rely on the common type. Testing: Existing WPT tests for serialization and transferring provide coverage. --------- Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
parent
0b8645d422
commit
7b16ae26b4
13 changed files with 170 additions and 337 deletions
|
@ -6,44 +6,34 @@
|
|||
//! (<https://html.spec.whatwg.org/multipage/#transferable-objects>).
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::num::NonZeroU32;
|
||||
use std::hash::Hash;
|
||||
|
||||
use base::id::PipelineNamespaceId;
|
||||
use base::id::NamespaceIndex;
|
||||
|
||||
use crate::dom::bindings::reflector::DomObject;
|
||||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
|
||||
use crate::dom::globalscope::GlobalScope;
|
||||
|
||||
pub(crate) trait IdFromComponents
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
fn from(namespace_id: PipelineNamespaceId, index: NonZeroU32) -> Self;
|
||||
}
|
||||
|
||||
pub(crate) trait ExtractComponents {
|
||||
fn components(&self) -> (PipelineNamespaceId, NonZeroU32);
|
||||
}
|
||||
|
||||
pub(crate) trait Transferable: DomObject
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
type Id: Eq + std::hash::Hash + Copy + IdFromComponents + ExtractComponents;
|
||||
type Index: Copy + Eq + Hash;
|
||||
type Data;
|
||||
|
||||
fn can_transfer(&self) -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn transfer(&self) -> Result<(Self::Id, Self::Data), ()>;
|
||||
fn transfer(&self) -> Result<(NamespaceIndex<Self::Index>, Self::Data), ()>;
|
||||
fn transfer_receive(
|
||||
owner: &GlobalScope,
|
||||
id: Self::Id,
|
||||
id: NamespaceIndex<Self::Index>,
|
||||
serialized: Self::Data,
|
||||
) -> Result<DomRoot<Self>, ()>;
|
||||
|
||||
fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>>;
|
||||
fn serialized_storage(
|
||||
data: StructuredData<'_>,
|
||||
) -> &mut Option<HashMap<NamespaceIndex<Self::Index>, Self::Data>>;
|
||||
fn deserialized_storage(reader: &mut StructuredDataReader) -> &mut Option<Vec<DomRoot<Self>>>;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue