mirror of
https://github.com/servo/servo.git
synced 2025-09-29 16:19:14 +01:00
content: Make QuotaExceededError serializable (#38720)
Implements (de)serialization behavior for QuotaExceededError and enables the annotation on the WebIDL spec. Testing: Adds its own WPT tests Fixes: https://github.com/servo/servo/issues/38685 --------- Signed-off-by: Rahul Menon <menonrahul02@gmail.com>
This commit is contained in:
parent
e80d36783a
commit
389277fa72
8 changed files with 149 additions and 7 deletions
|
@ -368,6 +368,8 @@ namespace_id! {DomPointId, DomPointIndex, "DomPoint"}
|
|||
|
||||
namespace_id! {DomExceptionId, DomExceptionIndex, "DomException"}
|
||||
|
||||
namespace_id! {QuotaExceededErrorId, QuotaExceededErrorIndex, "QuotaExceededError"}
|
||||
|
||||
namespace_id! {HistoryStateId, HistoryStateIndex, "HistoryState"}
|
||||
|
||||
namespace_id! {ImageBitmapId, ImageBitmapIndex, "ImageBitmap"}
|
||||
|
|
|
@ -12,6 +12,7 @@ use std::collections::HashMap;
|
|||
|
||||
use base::id::{
|
||||
BlobId, DomExceptionId, DomPointId, ImageBitmapId, MessagePortId, OffscreenCanvasId,
|
||||
QuotaExceededErrorId,
|
||||
};
|
||||
use log::warn;
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
|
@ -32,6 +33,9 @@ pub struct StructuredSerializedData {
|
|||
pub points: Option<HashMap<DomPointId, DomPoint>>,
|
||||
/// Serialized exception objects.
|
||||
pub exceptions: Option<HashMap<DomExceptionId, DomException>>,
|
||||
/// Serialized quota exceeded errors.
|
||||
pub quota_exceeded_errors:
|
||||
Option<HashMap<QuotaExceededErrorId, SerializableQuotaExceededError>>,
|
||||
/// Transferred objects.
|
||||
pub ports: Option<HashMap<MessagePortId, MessagePortImpl>>,
|
||||
/// Transform streams transferred objects.
|
||||
|
|
|
@ -11,7 +11,7 @@ use std::cell::RefCell;
|
|||
use std::collections::HashMap;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use base::id::{BlobId, DomExceptionId, DomPointId, ImageBitmapId};
|
||||
use base::id::{BlobId, DomExceptionId, DomPointId, ImageBitmapId, QuotaExceededErrorId};
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
use net_traits::filemanager_thread::RelativePos;
|
||||
use pixels::Snapshot;
|
||||
|
@ -38,6 +38,9 @@ where
|
|||
}
|
||||
|
||||
/// All the DOM interfaces that can be serialized.
|
||||
///
|
||||
/// NOTE: Variants which are derived from other serializable interfaces must come before their
|
||||
/// parents because serialization is attempted in order of the variants.
|
||||
#[derive(Clone, Copy, Debug, EnumIter)]
|
||||
pub enum Serializable {
|
||||
/// The `Blob` interface.
|
||||
|
@ -46,6 +49,8 @@ pub enum Serializable {
|
|||
DomPoint,
|
||||
/// The `DOMPointReadOnly` interface.
|
||||
DomPointReadOnly,
|
||||
/// The `QuotaExceededError` interface.
|
||||
QuotaExceededError,
|
||||
/// The `DOMException` interface.
|
||||
DomException,
|
||||
/// The `ImageBitmap` interface.
|
||||
|
@ -68,6 +73,9 @@ impl Serializable {
|
|||
Serializable::ImageBitmap => {
|
||||
StructuredSerializedData::clone_all_of_type::<SerializableImageBitmap>
|
||||
},
|
||||
Serializable::QuotaExceededError => {
|
||||
StructuredSerializedData::clone_all_of_type::<SerializableQuotaExceededError>
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -319,6 +327,30 @@ impl BroadcastClone for DomException {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
|
||||
/// A serializable version of the QuotaExceededError interface.
|
||||
pub struct SerializableQuotaExceededError {
|
||||
pub dom_exception: DomException,
|
||||
pub quota: Option<f64>,
|
||||
pub requested: Option<f64>,
|
||||
}
|
||||
|
||||
impl BroadcastClone for SerializableQuotaExceededError {
|
||||
type Id = QuotaExceededErrorId;
|
||||
|
||||
fn source(data: &StructuredSerializedData) -> &Option<HashMap<Self::Id, Self>> {
|
||||
&data.quota_exceeded_errors
|
||||
}
|
||||
|
||||
fn destination(data: &mut StructuredSerializedData) -> &mut Option<HashMap<Self::Id, Self>> {
|
||||
&mut data.quota_exceeded_errors
|
||||
}
|
||||
|
||||
fn clone_for_broadcast(&self) -> Option<Self> {
|
||||
Some(self.clone())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, MallocSizeOf, Serialize)]
|
||||
/// A serializable version of the ImageBitmap interface.
|
||||
pub struct SerializableImageBitmap {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue