servo · Gae24 · Jun 12, 2026 · Jun 12, 2026
@@ -183,7 +183,7 @@ impl ByteTeeUnderlyingSource {
                 byte_reader
                     .get()
                     .expect("Reader should be set.")
-                    .release(CanGc::from_cx(cx))?;
+                    .release(cx)?;
 
                 // Acquire default reader.
                 let default_reader = self

@@ -428,7 +428,7 @@ impl ReadableByteStreamController {
                         self.error(cx, error.handle());
 
                         // Perform readIntoRequest’s error steps, given e.
-                        read_into_request.error_steps(error.handle(), CanGc::from_cx(cx));
+                        read_into_request.error_steps(cx, error.handle());
 
                         // Return.
                         return;
@@ -458,7 +458,7 @@ impl ReadableByteStreamController {
                     rval.handle_mut(),
                     CanGc::from_cx(cx),
                 );
-                read_into_request.error_steps(rval.handle(), CanGc::from_cx(cx));
+                read_into_request.error_steps(cx, rval.handle());
 
                 // Return.
             },

@@ -1204,7 +1204,7 @@ impl ReadableStream {
 
         if let Some(reader) = byob_reader {
             // Perform ! ReadableStreamBYOBReaderErrorReadIntoRequests(reader, e).
-            reader.error_read_into_requests(e, CanGc::from_cx(cx));
+            reader.error_read_into_requests(cx, e);
         }
 
         // If reader is undefined, return.

@@ -119,12 +119,12 @@ impl ReadIntoRequest {
     }
 
     /// <https://streams.spec.whatwg.org/#ref-for-read-into-request-error-steps%E2%91%A0>
-    pub(crate) fn error_steps(&self, e: SafeHandleValue, can_gc: CanGc) {
+    pub(crate) fn error_steps(&self, cx: &mut JSContext, e: SafeHandleValue) {
         match self {
             ReadIntoRequest::Read(promise) => {
                 // error steps, given e
                 // Reject promise with e.
-                promise.reject_native(&e, can_gc)
+                promise.reject_native_with_cx(cx, &e)
             },
             ReadIntoRequest::ByteTee {
                 byte_tee_read_into_request,
@@ -250,29 +250,27 @@ impl ReadableStreamBYOBReader {
     }
 
     /// <https://streams.spec.whatwg.org/#abstract-opdef-readablestreambyobreaderrelease>
-    pub(crate) fn release(&self, can_gc: CanGc) -> Fallible<()> {
+    pub(crate) fn release(&self, cx: &mut JSContext) -> Fallible<()> {
         // Perform ! ReadableStreamReaderGenericRelease(reader).
-        self.generic_release(can_gc)
-            .expect("Generic release failed");
+        self.generic_release(cx).expect("Generic release failed");
         // Let e be a new TypeError exception.
-        let cx = GlobalScope::get_cx();
-        rooted!(in(*cx) let mut error = UndefinedValue());
+        rooted!(&in(cx) let mut error = UndefinedValue());
         Error::Type(c"Reader is released".to_owned()).to_jsval(
-            cx,
+            cx.into(),
             &self.global(),
             error.handle_mut(),
-            can_gc,
+            CanGc::from_cx(cx),
         );
 
         // Perform ! ReadableStreamBYOBReaderErrorReadIntoRequests(reader, e).
-        self.error_read_into_requests(error.handle(), can_gc);
+        self.error_read_into_requests(cx, error.handle());
         Ok(())
     }
 
     /// <https://streams.spec.whatwg.org/#abstract-opdef-readablestreambyobreadererrorreadintorequests>
-    pub(crate) fn error_read_into_requests(&self, e: SafeHandleValue, can_gc: CanGc) {
+    pub(crate) fn error_read_into_requests(&self, cx: &mut JSContext, e: SafeHandleValue) {
         // Reject reader.[[closedPromise]] with e.
-        self.closed_promise.borrow().reject_native(&e, can_gc);
+        self.closed_promise.borrow().reject_native_with_cx(cx, &e);
 
         // Set reader.[[closedPromise]].[[PromiseIsHandled]] to true.
         self.closed_promise.borrow().set_promise_is_handled();
@@ -283,7 +281,7 @@ impl ReadableStreamBYOBReader {
         // Set reader.[[readIntoRequests]] to a new empty list.
         for request in read_into_requests.drain(0..) {
             // Perform readIntoRequest’s error steps, given e.
-            request.error_steps(e, can_gc);
+            request.error_steps(cx, e);
         }
     }
 
@@ -338,7 +336,7 @@ impl ReadableStreamBYOBReader {
             rooted!(&in(cx) let mut error = UndefinedValue());
             stream.get_stored_error(error.handle_mut());
 
-            read_into_request.error_steps(error.handle(), CanGc::from_cx(cx));
+            read_into_request.error_steps(cx, error.handle());
         } else {
             // Otherwise,
             // perform ! ReadableByteStreamControllerPullInto(stream.[[controller]], view, min, readIntoRequest).
@@ -505,14 +503,14 @@ impl ReadableStreamBYOBReaderMethods<crate::DomTypeHolder> for ReadableStreamBYO
     }
 
     /// <https://streams.spec.whatwg.org/#byob-reader-release-lock>
-    fn ReleaseLock(&self, can_gc: CanGc) -> Fallible<()> {
+    fn ReleaseLock(&self, cx: &mut JSContext) -> Fallible<()> {
         if self.stream.get().is_none() {
             // If this.[[stream]] is undefined, return.
             return Ok(());
         }
 
         // Perform !ReadableStreamBYOBReaderRelease(this).
-        self.release(can_gc)
+        self.release(cx)
     }
 
     /// <https://streams.spec.whatwg.org/#generic-reader-closed>

@@ -442,8 +442,7 @@ impl ReadableStreamDefaultReader {
     /// <https://streams.spec.whatwg.org/#abstract-opdef-readablestreamdefaultreaderrelease>
     pub(crate) fn release(&self, cx: &mut js::context::JSContext) -> Fallible<()> {
         // Perform ! ReadableStreamReaderGenericRelease(reader).
-        self.generic_release(CanGc::from_cx(cx))
-            .expect("Generic release failed");
+        self.generic_release(cx).expect("Generic release failed");
         // Let e be a new TypeError exception.
         rooted!(&in(cx) let mut error = UndefinedValue());
         Error::Type(c"Reader is released".to_owned()).to_jsval(

@@ -4,6 +4,7 @@
 
 use std::rc::Rc;
 
+use js::context::JSContext;
 use js::jsval::UndefinedValue;
 use js::rust::HandleValue as SafeHandleValue;
 
@@ -63,7 +64,7 @@ pub(crate) trait ReadableStreamGenericReader {
     /// <https://streams.spec.whatwg.org/#readable-stream-reader-generic-cancel>
     fn reader_generic_cancel(
         &self,
-        cx: &mut js::context::JSContext,
+        cx: &mut JSContext,
         global: &GlobalScope,
         reason: SafeHandleValue,
     ) -> Rc<Promise> {
@@ -79,7 +80,7 @@ pub(crate) trait ReadableStreamGenericReader {
     }
 
     /// <https://streams.spec.whatwg.org/#readable-stream-reader-generic-release>
-    fn generic_release(&self, can_gc: CanGc) -> Fallible<()> {
+    fn generic_release(&self, cx: &mut JSContext) -> Fallible<()> {
         // Let stream be reader.[[stream]].
 
         // Assert: stream is not undefined.
@@ -95,26 +96,25 @@ pub(crate) trait ReadableStreamGenericReader {
 
             if stream.is_readable() {
                 // If stream.[[state]] is "readable", reject reader.[[closedPromise]] with a TypeError exception.
-                self.get_closed_promise().reject_error(
+                self.get_closed_promise().reject_error_with_cx(
+                    cx,
                     Error::Type(c"stream state is not readable".to_owned()),
-                    can_gc,
                 );
             } else {
                 // Otherwise, set reader.[[closedPromise]] to a promise rejected with a TypeError exception.
-                let cx = GlobalScope::get_cx();
-                rooted!(in(*cx) let mut error = UndefinedValue());
+                rooted!(&in(cx) let mut error = UndefinedValue());
                 Error::Type(c"Cannot release lock due to stream state.".to_owned()).to_jsval(
-                    cx,
+                    cx.into(),
                     &stream.global(),
                     error.handle_mut(),
-                    can_gc,
+                    CanGc::from_cx(cx),
                 );
 
                 self.set_closed_promise(Promise::new_rejected(
                     &stream.global(),
-                    cx,
+                    cx.into(),
                     error.handle(),
-                    can_gc,
+                    CanGc::from_cx(cx),
                 ));
             }
             // Set reader.[[closedPromise]].[[PromiseIsHandled]] to true.
@@ -141,7 +141,7 @@ pub(crate) trait ReadableStreamGenericReader {
     // <https://streams.spec.whatwg.org/#generic-reader-cancel>
     fn generic_cancel(
         &self,
-        cx: &mut js::context::JSContext,
+        cx: &mut JSContext,
         global: &GlobalScope,
         reason: SafeHandleValue,
     ) -> Rc<Promise> {

diff --git a/components/script_bindings/codegen/Bindings.conf b/components/script_bindings/codegen/Bindings.conf
@@ -1423,8 +1423,7 @@ DOMInterfaces = {
 },
 
 "ReadableStreamBYOBReader": {
-    "canGc": ["ReleaseLock"],
-    "cx": ["Read", "Cancel"]
+    "cx": ["Cancel", "Read", "ReleaseLock"]
 },
 
 "ReadableStreamDefaultReader": {