Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the need for crow allow unrooted lints in the queuing and de-queuing of values from default stream controllers (#34675)

Browse source 
Signed-off-by: gterzian <2792687+gterzian@users.noreply.github.com>
This commit is contained in:
Gregory Terzian 2024-12-19 13:41:37 +08:00 • committed by GitHub
parent a0ca34d9e8
commit 4a8b5a8290
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/script/dom/readablestreamdefaultcontroller.rs
View file

@ -203,14 +203,13 @@ pub struct QueueWithSizes {
impl QueueWithSizes { impl QueueWithSizes {
/// <https://streams.spec.whatwg.org/#dequeue-value> /// <https://streams.spec.whatwg.org/#dequeue-value>
#[allow(crown::unrooted_must_root)] fn dequeue_value(&mut self, cx: SafeJSContext, rval: MutableHandleValue) {
fn dequeue_value(&mut self) -> EnqueuedValue { let Some(value) = self.queue.front() else {
let value = self unreachable!("Buffer cannot be empty when dequeue value is called into.");
.queue };
.pop_front()
.expect("Buffer cannot be empty when dequeue value is called into.");
self.total_size -= value.size(); self.total_size -= value.size();
value value.to_jsval(cx, rval);
self.queue.pop_front();
} }
/// <https://streams.spec.whatwg.org/#enqueue-value-with-size> /// <https://streams.spec.whatwg.org/#enqueue-value-with-size>
@ -420,10 +419,9 @@ impl ReadableStreamDefaultController {
} }
/// <https://streams.spec.whatwg.org/#dequeue-value> /// <https://streams.spec.whatwg.org/#dequeue-value>
#[allow(crown::unrooted_must_root)] fn dequeue_value(&self, cx: SafeJSContext, rval: MutableHandleValue) {
fn dequeue_value(&self) -> EnqueuedValue {
let mut queue = self.queue.borrow_mut(); let mut queue = self.queue.borrow_mut();
queue.dequeue_value() queue.dequeue_value(cx, rval);
} }
/// <https://streams.spec.whatwg.org/#readable-stream-default-controller-should-call-pull> /// <https://streams.spec.whatwg.org/#readable-stream-default-controller-should-call-pull>
@ -568,7 +566,6 @@ impl ReadableStreamDefaultController {
} }
/// <https://streams.spec.whatwg.org/#rs-default-controller-private-pull> /// <https://streams.spec.whatwg.org/#rs-default-controller-private-pull>
#[allow(crown::unrooted_must_root)]
pub fn perform_pull_steps(&self, read_request: &ReadRequest, can_gc: CanGc) { pub fn perform_pull_steps(&self, read_request: &ReadRequest, can_gc: CanGc) {
// Let stream be this.[[stream]]. // Let stream be this.[[stream]].
// Note: the spec does not assert that there is a stream. // Note: the spec does not assert that there is a stream.
@ -578,13 +575,10 @@ impl ReadableStreamDefaultController {
// if queue contains bytes, perform chunk steps. // if queue contains bytes, perform chunk steps.
if !self.queue.borrow().is_empty() { if !self.queue.borrow().is_empty() {
// Rooting: chunk will be tied to a rooted value
// before calling into a function that can GC.
let chunk = self.dequeue_value();
let cx = GlobalScope::get_cx(); let cx = GlobalScope::get_cx();
rooted!(in(*cx) let mut rval = UndefinedValue()); rooted!(in(*cx) let mut rval = UndefinedValue());
let result = RootedTraceableBox::new(Heap::default()); let result = RootedTraceableBox::new(Heap::default());
chunk.to_jsval(cx, rval.handle_mut()); self.dequeue_value(cx, rval.handle_mut());
result.set(*rval); result.set(*rval);
// If this.[[closeRequested]] is true and this.[[queue]] is empty // If this.[[closeRequested]] is true and this.[[queue]] is empty
@ -711,7 +705,6 @@ impl ReadableStreamDefaultController {
/// Native call to /// Native call to
/// <https://streams.spec.whatwg.org/#readable-stream-default-controller-enqueue> /// <https://streams.spec.whatwg.org/#readable-stream-default-controller-enqueue>
#[allow(crown::unrooted_must_root)]
pub fn enqueue_native(&self, chunk: Vec<u8>) { pub fn enqueue_native(&self, chunk: Vec<u8>) {
let stream = self let stream = self
.stream .stream
@ -720,8 +713,7 @@ impl ReadableStreamDefaultController {
if stream.is_locked() && stream.get_num_read_requests() > 0 { if stream.is_locked() && stream.get_num_read_requests() > 0 {
let cx = GlobalScope::get_cx(); let cx = GlobalScope::get_cx();
rooted!(in(*cx) let mut rval = UndefinedValue()); rooted!(in(*cx) let mut rval = UndefinedValue());
let enqueued_chunk = EnqueuedValue::Native(chunk.into_boxed_slice()); EnqueuedValue::Native(chunk.into_boxed_slice()).to_jsval(cx, rval.handle_mut());
enqueued_chunk.to_jsval(cx, rval.handle_mut());
stream.fulfill_read_request(rval.handle(), false); stream.fulfill_read_request(rval.handle(), false);
} else { } else {
let mut queue = self.queue.borrow_mut(); let mut queue = self.queue.borrow_mut();