Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Streams: remove unnecessary special hanlding of dataclone error (#36628)

Browse source 
This removes a now unnecessary handling of dataclone error when port
posts a message handling error to support stream transfers.

Fix https://github.com/servo/servo/issues/36479

Signed-off-by: gterzian <2792687+gterzian@users.noreply.github.com>
This commit is contained in:
Gregory Terzian 2025-04-21 16:31:25 +08:00 • committed by GitHub
parent 233c9aaea6
commit a0419faa85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/messageport.rs
View file

@ -20,7 +20,7 @@ use crate::dom::bindings::codegen::Bindings::MessagePortBinding::{
MessagePortMethods, StructuredSerializeOptions, MessagePortMethods, StructuredSerializeOptions,
}; };
use crate::dom::bindings::conversions::root_from_object; use crate::dom::bindings::conversions::root_from_object;
use crate::dom::bindings::error::{Error, ErrorResult}; use crate::dom::bindings::error::{Error, ErrorResult, ErrorToJsval};
use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::root::DomRoot;
@ -180,14 +180,13 @@ impl MessagePort {
let result = self.pack_and_post_message(type_, value, can_gc); let result = self.pack_and_post_message(type_, value, can_gc);
// If result is an abrupt completion, // If result is an abrupt completion,
if result.is_err() { if let Err(error) = result.as_ref() {
// Perform ! CrossRealmTransformSendError(port, result.[[Value]]). // Perform ! CrossRealmTransformSendError(port, result.[[Value]]).
// Note: we send UndefinedValue across,
// because somehow sending an error results in another error.
// The Error::DataClone, which is the only one that is sent across,
// will be created upon receipt.
let cx = GlobalScope::get_cx(); let cx = GlobalScope::get_cx();
rooted!(in(*cx) let mut rooted_error = UndefinedValue()); rooted!(in(*cx) let mut rooted_error = UndefinedValue());
error
.clone()
.to_jsval(cx, &self.global(), rooted_error.handle_mut(), can_gc);
self.cross_realm_transform_send_error(rooted_error.handle(), can_gc); self.cross_realm_transform_send_error(rooted_error.handle(), can_gc);
} }

15
components/script/dom/readablestream.rs
View file

@ -2088,19 +2088,8 @@ impl CrossRealmTransformReadable {
// Otherwise, if type is "error", // Otherwise, if type is "error",
if type_string == "error" { if type_string == "error" {
if value.is_undefined() { // Perform ! ReadableStreamDefaultControllerError(controller, value).
// Note: for DataClone errors, we send UndefinedValue across, self.controller.error(value.handle(), can_gc);
// because somehow sending the error results in another error.
// The error is then created here.
rooted!(in(*cx) let mut rooted_error = UndefinedValue());
Error::DataClone(None).to_jsval(cx, global, rooted_error.handle_mut(), can_gc);
// Perform ! ReadableStreamDefaultControllerError(controller, value).
self.controller.error(rooted_error.handle(), can_gc);
} else {
// Perform ! ReadableStreamDefaultControllerError(controller, value).
self.controller.error(value.handle(), can_gc);
}
// Disentangle port. // Disentangle port.
global.disentangle_port(port); global.disentangle_port(port);