mirror of
https://github.com/servo/servo.git
synced 2025-09-30 00:29: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
|
@ -11,12 +11,12 @@ use std::ptr;
|
|||
|
||||
use base::id::{
|
||||
BlobId, DomExceptionId, DomPointId, ImageBitmapId, Index, MessagePortId, NamespaceIndex,
|
||||
OffscreenCanvasId, PipelineNamespaceId,
|
||||
OffscreenCanvasId, PipelineNamespaceId, QuotaExceededErrorId,
|
||||
};
|
||||
use constellation_traits::{
|
||||
BlobImpl, DomException, DomPoint, MessagePortImpl, Serializable as SerializableInterface,
|
||||
SerializableImageBitmap, StructuredSerializedData, TransferableOffscreenCanvas,
|
||||
Transferrable as TransferrableInterface, TransformStreamData,
|
||||
SerializableImageBitmap, SerializableQuotaExceededError, StructuredSerializedData,
|
||||
TransferableOffscreenCanvas, Transferrable as TransferrableInterface, TransformStreamData,
|
||||
};
|
||||
use js::gc::RootedVec;
|
||||
use js::glue::{
|
||||
|
@ -49,7 +49,7 @@ use crate::dom::imagebitmap::ImageBitmap;
|
|||
use crate::dom::messageport::MessagePort;
|
||||
use crate::dom::offscreencanvas::OffscreenCanvas;
|
||||
use crate::dom::readablestream::ReadableStream;
|
||||
use crate::dom::types::{DOMException, TransformStream};
|
||||
use crate::dom::types::{DOMException, QuotaExceededError, TransformStream};
|
||||
use crate::dom::writablestream::WritableStream;
|
||||
use crate::realms::{AlreadyInRealm, InRealm, enter_realm};
|
||||
use crate::script_runtime::{CanGc, JSContext as SafeJSContext};
|
||||
|
@ -73,6 +73,7 @@ pub(super) enum StructuredCloneTags {
|
|||
TransformStream = 0xFFFF8009,
|
||||
ImageBitmap = 0xFFFF800A,
|
||||
OffscreenCanvas = 0xFFFF800B,
|
||||
QuotaExceededError = 0xFFFF800C,
|
||||
Max = 0xFFFFFFFF,
|
||||
}
|
||||
|
||||
|
@ -84,6 +85,7 @@ impl From<SerializableInterface> for StructuredCloneTags {
|
|||
SerializableInterface::DomPoint => StructuredCloneTags::DomPoint,
|
||||
SerializableInterface::DomException => StructuredCloneTags::DomException,
|
||||
SerializableInterface::ImageBitmap => StructuredCloneTags::ImageBitmap,
|
||||
SerializableInterface::QuotaExceededError => StructuredCloneTags::QuotaExceededError,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -115,6 +117,7 @@ fn reader_for_type(
|
|||
SerializableInterface::DomPoint => read_object::<DOMPoint>,
|
||||
SerializableInterface::DomException => read_object::<DOMException>,
|
||||
SerializableInterface::ImageBitmap => read_object::<ImageBitmap>,
|
||||
SerializableInterface::QuotaExceededError => read_object::<QuotaExceededError>,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -259,6 +262,7 @@ fn serialize_for_type(val: SerializableInterface) -> SerializeOperation {
|
|||
SerializableInterface::DomPoint => try_serialize::<DOMPoint>,
|
||||
SerializableInterface::DomException => try_serialize::<DOMException>,
|
||||
SerializableInterface::ImageBitmap => try_serialize::<ImageBitmap>,
|
||||
SerializableInterface::QuotaExceededError => try_serialize::<QuotaExceededError>,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -570,6 +574,9 @@ pub(crate) struct StructuredDataReader<'a> {
|
|||
pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
|
||||
/// A map of serialized exceptions.
|
||||
pub(crate) exceptions: Option<HashMap<DomExceptionId, DomException>>,
|
||||
/// A map of serialized quota exceeded errors.
|
||||
pub(crate) quota_exceeded_errors:
|
||||
Option<HashMap<QuotaExceededErrorId, SerializableQuotaExceededError>>,
|
||||
// A map of serialized image bitmaps.
|
||||
pub(crate) image_bitmaps: Option<HashMap<ImageBitmapId, SerializableImageBitmap>>,
|
||||
/// A map of transferred image bitmaps.
|
||||
|
@ -592,6 +599,9 @@ pub(crate) struct StructuredDataWriter {
|
|||
pub(crate) points: Option<HashMap<DomPointId, DomPoint>>,
|
||||
/// Serialized exceptions.
|
||||
pub(crate) exceptions: Option<HashMap<DomExceptionId, DomException>>,
|
||||
/// Serialized quota exceeded errors.
|
||||
pub(crate) quota_exceeded_errors:
|
||||
Option<HashMap<QuotaExceededErrorId, SerializableQuotaExceededError>>,
|
||||
/// Serialized blobs.
|
||||
pub(crate) blobs: Option<HashMap<BlobId, BlobImpl>>,
|
||||
/// Serialized image bitmaps.
|
||||
|
@ -656,6 +666,7 @@ pub(crate) fn write(
|
|||
transform_streams: sc_writer.transform_streams_port.take(),
|
||||
points: sc_writer.points.take(),
|
||||
exceptions: sc_writer.exceptions.take(),
|
||||
quota_exceeded_errors: sc_writer.quota_exceeded_errors.take(),
|
||||
blobs: sc_writer.blobs.take(),
|
||||
image_bitmaps: sc_writer.image_bitmaps.take(),
|
||||
transferred_image_bitmaps: sc_writer.transferred_image_bitmaps.take(),
|
||||
|
@ -684,6 +695,7 @@ pub(crate) fn read(
|
|||
blob_impls: data.blobs.take(),
|
||||
points: data.points.take(),
|
||||
exceptions: data.exceptions.take(),
|
||||
quota_exceeded_errors: data.quota_exceeded_errors.take(),
|
||||
image_bitmaps: data.image_bitmaps.take(),
|
||||
transferred_image_bitmaps: data.transferred_image_bitmaps.take(),
|
||||
offscreen_canvases: data.offscreen_canvases.take(),
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
* 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/. */
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use base::id::{QuotaExceededErrorId, QuotaExceededErrorIndex};
|
||||
use constellation_traits::SerializableQuotaExceededError;
|
||||
use dom_struct::dom_struct;
|
||||
use js::gc::HandleObject;
|
||||
use script_bindings::codegen::GenericBindings::QuotaExceededErrorBinding::{
|
||||
|
@ -14,6 +18,8 @@ use script_bindings::str::DOMString;
|
|||
|
||||
use crate::dom::bindings::error::Error;
|
||||
use crate::dom::bindings::reflector::{reflect_dom_object, reflect_dom_object_with_proto};
|
||||
use crate::dom::bindings::serializable::Serializable;
|
||||
use crate::dom::bindings::structuredclone::StructuredData;
|
||||
use crate::dom::types::{DOMException, GlobalScope};
|
||||
|
||||
/// <https://webidl.spec.whatwg.org/#quotaexceedederror>
|
||||
|
@ -116,3 +122,53 @@ impl QuotaExceededErrorMethods<crate::DomTypeHolder> for QuotaExceededError {
|
|||
self.requested
|
||||
}
|
||||
}
|
||||
|
||||
impl Serializable for QuotaExceededError {
|
||||
type Index = QuotaExceededErrorIndex;
|
||||
type Data = SerializableQuotaExceededError;
|
||||
|
||||
/// <https://webidl.spec.whatwg.org/#quotaexceedederror>
|
||||
fn serialize(&self) -> Result<(QuotaExceededErrorId, Self::Data), ()> {
|
||||
let (_, dom_exception) = self.dom_exception.serialize()?;
|
||||
let serialized = SerializableQuotaExceededError {
|
||||
dom_exception,
|
||||
quota: self.quota.as_deref().copied(),
|
||||
requested: self.requested.as_deref().copied(),
|
||||
};
|
||||
Ok((QuotaExceededErrorId::new(), serialized))
|
||||
}
|
||||
|
||||
/// <https://webidl.spec.whatwg.org/#quotaexceedederror>
|
||||
fn deserialize(
|
||||
owner: &GlobalScope,
|
||||
serialized: Self::Data,
|
||||
can_gc: CanGc,
|
||||
) -> Result<DomRoot<Self>, ()>
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
Ok(Self::new(
|
||||
owner,
|
||||
DOMString::from(serialized.dom_exception.message),
|
||||
serialized
|
||||
.quota
|
||||
.map(|val| Finite::new(val).ok_or(()))
|
||||
.transpose()?,
|
||||
serialized
|
||||
.requested
|
||||
.map(|val| Finite::new(val).ok_or(()))
|
||||
.transpose()?,
|
||||
can_gc,
|
||||
))
|
||||
}
|
||||
|
||||
/// <https://webidl.spec.whatwg.org/#quotaexceedederror>
|
||||
fn serialized_storage<'a>(
|
||||
data: StructuredData<'a, '_>,
|
||||
) -> &'a mut Option<HashMap<QuotaExceededErrorId, Self::Data>> {
|
||||
match data {
|
||||
StructuredData::Reader(reader) => &mut reader.quota_exceeded_errors,
|
||||
StructuredData::Writer(writer) => &mut writer.quota_exceeded_errors,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue