mirror of
https://github.com/servo/servo.git
synced 2025-08-04 05:00:08 +01:00
Make DOMException serializable (#36535)
Follow the implementation of making DOMPoint and DOMPointReadOnly serializable in PR #35989 Testing: Passed a test previously expected to fail. Fixes: #36463 --------- Signed-off-by: Kingsley Yung <kingsley@kkoyung.dev>
This commit is contained in:
parent
cc04caa8ce
commit
dacd951c9f
6 changed files with 138 additions and 12 deletions
|
@ -10,9 +10,9 @@ use std::num::NonZeroU32;
|
||||||
use std::os::raw;
|
use std::os::raw;
|
||||||
use std::ptr;
|
use std::ptr;
|
||||||
|
|
||||||
use base::id::{BlobId, DomPointId, MessagePortId, PipelineNamespaceId};
|
use base::id::{BlobId, DomExceptionId, DomPointId, MessagePortId, PipelineNamespaceId};
|
||||||
use constellation_traits::{
|
use constellation_traits::{
|
||||||
BlobImpl, DomPoint, MessagePortImpl, Serializable as SerializableInterface,
|
BlobImpl, DomException, DomPoint, MessagePortImpl, Serializable as SerializableInterface,
|
||||||
StructuredSerializedData, Transferrable as TransferrableInterface,
|
StructuredSerializedData, Transferrable as TransferrableInterface,
|
||||||
};
|
};
|
||||||
use js::glue::{
|
use js::glue::{
|
||||||
|
@ -42,6 +42,7 @@ use crate::dom::dompointreadonly::DOMPointReadOnly;
|
||||||
use crate::dom::globalscope::GlobalScope;
|
use crate::dom::globalscope::GlobalScope;
|
||||||
use crate::dom::messageport::MessagePort;
|
use crate::dom::messageport::MessagePort;
|
||||||
use crate::dom::readablestream::ReadableStream;
|
use crate::dom::readablestream::ReadableStream;
|
||||||
|
use crate::dom::types::DOMException;
|
||||||
use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
|
use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
|
||||||
use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
|
use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
|
||||||
|
|
||||||
|
@ -59,6 +60,7 @@ pub(super) enum StructuredCloneTags {
|
||||||
DomPointReadOnly = 0xFFFF8004,
|
DomPointReadOnly = 0xFFFF8004,
|
||||||
DomPoint = 0xFFFF8005,
|
DomPoint = 0xFFFF8005,
|
||||||
ReadableStream = 0xFFFF8006,
|
ReadableStream = 0xFFFF8006,
|
||||||
|
DomException = 0xFFFF8007,
|
||||||
Max = 0xFFFFFFFF,
|
Max = 0xFFFFFFFF,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,6 +70,7 @@ impl From<SerializableInterface> for StructuredCloneTags {
|
||||||
SerializableInterface::Blob => StructuredCloneTags::DomBlob,
|
SerializableInterface::Blob => StructuredCloneTags::DomBlob,
|
||||||
SerializableInterface::DomPointReadOnly => StructuredCloneTags::DomPointReadOnly,
|
SerializableInterface::DomPointReadOnly => StructuredCloneTags::DomPointReadOnly,
|
||||||
SerializableInterface::DomPoint => StructuredCloneTags::DomPoint,
|
SerializableInterface::DomPoint => StructuredCloneTags::DomPoint,
|
||||||
|
SerializableInterface::DomException => StructuredCloneTags::DomException,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -93,6 +96,7 @@ fn reader_for_type(
|
||||||
SerializableInterface::Blob => read_object::<Blob>,
|
SerializableInterface::Blob => read_object::<Blob>,
|
||||||
SerializableInterface::DomPointReadOnly => read_object::<DOMPointReadOnly>,
|
SerializableInterface::DomPointReadOnly => read_object::<DOMPointReadOnly>,
|
||||||
SerializableInterface::DomPoint => read_object::<DOMPoint>,
|
SerializableInterface::DomPoint => read_object::<DOMPoint>,
|
||||||
|
SerializableInterface::DomException => read_object::<DOMException>,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,6 +230,7 @@ fn serialize_for_type(val: SerializableInterface) -> SerializeOperation {
|
||||||
SerializableInterface::Blob => try_serialize::<Blob>,
|
SerializableInterface::Blob => try_serialize::<Blob>,
|
||||||
SerializableInterface::DomPointReadOnly => try_serialize::<DOMPointReadOnly>,
|
SerializableInterface::DomPointReadOnly => try_serialize::<DOMPointReadOnly>,
|
||||||
SerializableInterface::DomPoint => try_serialize::<DOMPoint>,
|
SerializableInterface::DomPoint => try_serialize::<DOMPoint>,
|
||||||
|
SerializableInterface::DomException => try_serialize::<DOMException>,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -500,6 +505,8 @@ pub(crate) struct StructuredDataReader {
|
||||||
/// A map of deserialized points, stored temporarily here to keep them rooted.
|
/// A map of deserialized points, stored temporarily here to keep them rooted.
|
||||||
pub(crate) points_read_only: Option<HashMap<StorageKey, DomRoot<DOMPointReadOnly>>>,
|
pub(crate) points_read_only: Option<HashMap<StorageKey, DomRoot<DOMPointReadOnly>>>,
|
||||||
pub(crate) dom_points: Option<HashMap<StorageKey, DomRoot<DOMPoint>>>,
|
pub(crate) dom_points: Option<HashMap<StorageKey, DomRoot<DOMPoint>>>,
|
||||||
|
/// A map of deserialized exceptions, stored temporarily here to keep them rooted.
|
||||||
|
pub(crate) dom_exceptions: Option<HashMap<StorageKey, DomRoot<DOMException>>>,
|
||||||
/// A vec of transfer-received DOM ports,
|
/// A vec of transfer-received DOM ports,
|
||||||
/// to be made available to script through a message event.
|
/// to be made available to script through a message event.
|
||||||
pub(crate) message_ports: Option<Vec<DomRoot<MessagePort>>>,
|
pub(crate) message_ports: Option<Vec<DomRoot<MessagePort>>>,
|
||||||
|
@ -513,6 +520,8 @@ pub(crate) struct StructuredDataReader {
|
||||||
pub(crate) blob_impls: Option<HashMap<BlobId, BlobImpl>>,
|
pub(crate) blob_impls: Option<HashMap<BlobId, BlobImpl>>,
|
||||||
/// A map of serialized points.
|
/// A map of serialized points.
|
||||||
pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
|
pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
|
||||||
|
/// A map of serialized exceptions.
|
||||||
|
pub(crate) exceptions: Option<HashMap<DomExceptionId, DomException>>,
|
||||||
pub(crate) readable_streams: Option<Vec<DomRoot<ReadableStream>>>,
|
pub(crate) readable_streams: Option<Vec<DomRoot<ReadableStream>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -526,6 +535,8 @@ pub(crate) struct StructuredDataWriter {
|
||||||
pub(crate) ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
|
pub(crate) ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
|
||||||
/// Serialized points.
|
/// Serialized points.
|
||||||
pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
|
pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
|
||||||
|
/// Serialized exceptions.
|
||||||
|
pub(crate) exceptions: Option<HashMap<DomExceptionId, DomException>>,
|
||||||
/// Serialized blobs.
|
/// Serialized blobs.
|
||||||
pub(crate) blobs: Option<HashMap<BlobId, BlobImpl>>,
|
pub(crate) blobs: Option<HashMap<BlobId, BlobImpl>>,
|
||||||
}
|
}
|
||||||
|
@ -579,6 +590,7 @@ pub(crate) fn write(
|
||||||
serialized: data,
|
serialized: data,
|
||||||
ports: sc_writer.ports.take(),
|
ports: sc_writer.ports.take(),
|
||||||
points: sc_writer.points.take(),
|
points: sc_writer.points.take(),
|
||||||
|
exceptions: sc_writer.exceptions.take(),
|
||||||
blobs: sc_writer.blobs.take(),
|
blobs: sc_writer.blobs.take(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -600,9 +612,11 @@ pub(crate) fn read(
|
||||||
message_ports: None,
|
message_ports: None,
|
||||||
points_read_only: None,
|
points_read_only: None,
|
||||||
dom_points: None,
|
dom_points: None,
|
||||||
|
dom_exceptions: None,
|
||||||
port_impls: data.ports.take(),
|
port_impls: data.ports.take(),
|
||||||
blob_impls: data.blobs.take(),
|
blob_impls: data.blobs.take(),
|
||||||
points: data.points.take(),
|
points: data.points.take(),
|
||||||
|
exceptions: data.exceptions.take(),
|
||||||
errors: DOMErrorRecord { message: None },
|
errors: DOMErrorRecord { message: None },
|
||||||
readable_streams: None,
|
readable_streams: None,
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::num::NonZeroU32;
|
||||||
|
|
||||||
|
use base::id::{DomExceptionId, DomExceptionIndex, PipelineNamespaceId};
|
||||||
|
use constellation_traits::DomException;
|
||||||
use dom_struct::dom_struct;
|
use dom_struct::dom_struct;
|
||||||
use js::rust::HandleObject;
|
use js::rust::HandleObject;
|
||||||
|
|
||||||
|
@ -13,7 +18,9 @@ use crate::dom::bindings::reflector::{
|
||||||
Reflector, reflect_dom_object, reflect_dom_object_with_proto,
|
Reflector, reflect_dom_object, reflect_dom_object_with_proto,
|
||||||
};
|
};
|
||||||
use crate::dom::bindings::root::DomRoot;
|
use crate::dom::bindings::root::DomRoot;
|
||||||
|
use crate::dom::bindings::serializable::{IntoStorageKey, Serializable, StorageKey};
|
||||||
use crate::dom::bindings::str::DOMString;
|
use crate::dom::bindings::str::DOMString;
|
||||||
|
use crate::dom::bindings::structuredclone::{StructuredData, StructuredDataReader};
|
||||||
use crate::dom::globalscope::GlobalScope;
|
use crate::dom::globalscope::GlobalScope;
|
||||||
use crate::script_runtime::CanGc;
|
use crate::script_runtime::CanGc;
|
||||||
|
|
||||||
|
@ -215,3 +222,68 @@ impl DOMExceptionMethods<crate::DomTypeHolder> for DOMException {
|
||||||
self.message.clone()
|
self.message.clone()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Serializable for DOMException {
|
||||||
|
type Id = DomExceptionId;
|
||||||
|
type Data = DomException;
|
||||||
|
|
||||||
|
// https://webidl.spec.whatwg.org/#idl-DOMException
|
||||||
|
fn serialize(&self) -> Result<(Self::Id, Self::Data), ()> {
|
||||||
|
let serialized = DomException {
|
||||||
|
message: self.message.to_string(),
|
||||||
|
name: self.name.to_string(),
|
||||||
|
};
|
||||||
|
Ok((DomExceptionId::new(), serialized))
|
||||||
|
}
|
||||||
|
|
||||||
|
// https://webidl.spec.whatwg.org/#idl-DOMException
|
||||||
|
fn deserialize(
|
||||||
|
owner: &GlobalScope,
|
||||||
|
serialized: Self::Data,
|
||||||
|
can_gc: CanGc,
|
||||||
|
) -> Result<DomRoot<Self>, ()>
|
||||||
|
where
|
||||||
|
Self: Sized,
|
||||||
|
{
|
||||||
|
Ok(Self::new_with_custom_message(
|
||||||
|
owner,
|
||||||
|
DOMErrorName::from(&DOMString::from_string(serialized.name)).ok_or(())?,
|
||||||
|
serialized.message,
|
||||||
|
can_gc,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn serialized_storage(data: StructuredData<'_>) -> &mut Option<HashMap<Self::Id, Self::Data>> {
|
||||||
|
match data {
|
||||||
|
StructuredData::Reader(reader) => &mut reader.exceptions,
|
||||||
|
StructuredData::Writer(writer) => &mut writer.exceptions,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn deserialized_storage(
|
||||||
|
reader: &mut StructuredDataReader,
|
||||||
|
) -> &mut Option<HashMap<StorageKey, DomRoot<Self>>> {
|
||||||
|
&mut reader.dom_exceptions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<StorageKey> for DomExceptionId {
|
||||||
|
fn from(storage_key: StorageKey) -> DomExceptionId {
|
||||||
|
let namespace_id = PipelineNamespaceId(storage_key.name_space);
|
||||||
|
let index = DomExceptionIndex(
|
||||||
|
NonZeroU32::new(storage_key.index).expect("Deserialized exception index is zero"),
|
||||||
|
);
|
||||||
|
|
||||||
|
DomExceptionId {
|
||||||
|
namespace_id,
|
||||||
|
index,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IntoStorageKey for DomExceptionId {
|
||||||
|
fn into_storage_key(self) -> StorageKey {
|
||||||
|
let DomExceptionIndex(index) = self.index;
|
||||||
|
StorageKey::new(self.namespace_id, index)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -196,6 +196,7 @@ impl PipelineNamespace {
|
||||||
self, ServiceWorkerRegistrationIndex}
|
self, ServiceWorkerRegistrationIndex}
|
||||||
namespace_id_method! {next_blob_id, BlobId, self, BlobIndex}
|
namespace_id_method! {next_blob_id, BlobId, self, BlobIndex}
|
||||||
namespace_id_method! {next_dom_point_id, DomPointId, self, DomPointIndex}
|
namespace_id_method! {next_dom_point_id, DomPointId, self, DomPointIndex}
|
||||||
|
namespace_id_method! {next_dom_exception_id, DomExceptionId, self, DomExceptionIndex}
|
||||||
}
|
}
|
||||||
|
|
||||||
thread_local!(pub static PIPELINE_NAMESPACE: Cell<Option<PipelineNamespace>> = const { Cell::new(None) });
|
thread_local!(pub static PIPELINE_NAMESPACE: Cell<Option<PipelineNamespace>> = const { Cell::new(None) });
|
||||||
|
@ -425,6 +426,19 @@ impl DomPointId {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace_id! {DomExceptionId, DomExceptionIndex, "DomException"}
|
||||||
|
|
||||||
|
impl DomExceptionId {
|
||||||
|
pub fn new() -> DomExceptionId {
|
||||||
|
PIPELINE_NAMESPACE.with(|tls| {
|
||||||
|
let mut namespace = tls.get().expect("No namespace set for this thread!");
|
||||||
|
let next_exception_id = namespace.next_dom_exception_id();
|
||||||
|
tls.set(Some(namespace));
|
||||||
|
next_exception_id
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
namespace_id! {HistoryStateId, HistoryStateIndex, "HistoryState"}
|
namespace_id! {HistoryStateId, HistoryStateIndex, "HistoryState"}
|
||||||
|
|
||||||
impl HistoryStateId {
|
impl HistoryStateId {
|
||||||
|
|
|
@ -13,7 +13,7 @@ use std::cell::RefCell;
|
||||||
use std::collections::{HashMap, VecDeque};
|
use std::collections::{HashMap, VecDeque};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use base::id::{BlobId, DomPointId, MessagePortId};
|
use base::id::{BlobId, DomExceptionId, DomPointId, MessagePortId};
|
||||||
use log::warn;
|
use log::warn;
|
||||||
use malloc_size_of_derive::MallocSizeOf;
|
use malloc_size_of_derive::MallocSizeOf;
|
||||||
use net_traits::filemanager_thread::RelativePos;
|
use net_traits::filemanager_thread::RelativePos;
|
||||||
|
@ -177,6 +177,8 @@ pub struct StructuredSerializedData {
|
||||||
pub blobs: Option<HashMap<BlobId, BlobImpl>>,
|
pub blobs: Option<HashMap<BlobId, BlobImpl>>,
|
||||||
/// Serialized point objects.
|
/// Serialized point objects.
|
||||||
pub points: Option<HashMap<DomPointId, DomPoint>>,
|
pub points: Option<HashMap<DomPointId, DomPoint>>,
|
||||||
|
/// Serialized exception objects.
|
||||||
|
pub exceptions: Option<HashMap<DomExceptionId, DomException>>,
|
||||||
/// Transferred objects.
|
/// Transferred objects.
|
||||||
pub ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
|
pub ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
|
||||||
}
|
}
|
||||||
|
@ -205,6 +207,8 @@ pub enum Serializable {
|
||||||
DomPoint,
|
DomPoint,
|
||||||
/// The `DOMPointReadOnly` interface.
|
/// The `DOMPointReadOnly` interface.
|
||||||
DomPointReadOnly,
|
DomPointReadOnly,
|
||||||
|
/// The `DOMException` interface.
|
||||||
|
DomException,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Serializable {
|
impl Serializable {
|
||||||
|
@ -215,6 +219,9 @@ impl Serializable {
|
||||||
StructuredSerializedData::clone_all_of_type::<DomPoint>
|
StructuredSerializedData::clone_all_of_type::<DomPoint>
|
||||||
},
|
},
|
||||||
Serializable::DomPoint => StructuredSerializedData::clone_all_of_type::<DomPoint>,
|
Serializable::DomPoint => StructuredSerializedData::clone_all_of_type::<DomPoint>,
|
||||||
|
Serializable::DomException => {
|
||||||
|
StructuredSerializedData::clone_all_of_type::<DomException>
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -294,6 +301,7 @@ pub struct PortMessageTask {
|
||||||
|
|
||||||
/// Messages for communication between the constellation and a global managing ports.
|
/// Messages for communication between the constellation and a global managing ports.
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
|
#[allow(clippy::large_enum_variant)]
|
||||||
pub enum MessagePortMsg {
|
pub enum MessagePortMsg {
|
||||||
/// Complete the transfer for a batch of ports.
|
/// Complete the transfer for a batch of ports.
|
||||||
CompleteTransfer(HashMap<MessagePortId, VecDeque<PortMessageTask>>),
|
CompleteTransfer(HashMap<MessagePortId, VecDeque<PortMessageTask>>),
|
||||||
|
@ -526,3 +534,30 @@ impl BroadcastClone for DomPoint {
|
||||||
Some(self.clone())
|
Some(self.clone())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
|
||||||
|
/// A serializable version of the DOMException interface.
|
||||||
|
pub struct DomException {
|
||||||
|
pub message: String,
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BroadcastClone for DomException {
|
||||||
|
type Id = DomExceptionId;
|
||||||
|
|
||||||
|
fn source(
|
||||||
|
data: &StructuredSerializedData,
|
||||||
|
) -> &Option<std::collections::HashMap<Self::Id, Self>> {
|
||||||
|
&data.exceptions
|
||||||
|
}
|
||||||
|
|
||||||
|
fn destination(
|
||||||
|
data: &mut StructuredSerializedData,
|
||||||
|
) -> &mut Option<std::collections::HashMap<Self::Id, Self>> {
|
||||||
|
&mut data.exceptions
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clone_for_broadcast(&self) -> Option<Self> {
|
||||||
|
Some(self.clone())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -4,9 +4,3 @@
|
||||||
|
|
||||||
[ImageData expandos are not cloned]
|
[ImageData expandos are not cloned]
|
||||||
expected: FAIL
|
expected: FAIL
|
||||||
|
|
||||||
[DOMException objects can be cloned]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[DOMException objects created by the UA can be cloned]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
[reason.html]
|
|
||||||
[DOMException errors should be preserved]
|
|
||||||
expected: FAIL
|
|
Loading…
Add table
Add a link
Reference in a new issue