script: Move BlobMethods to &mut JSContext#43215
Merged
Merged
Conversation
Signed-off-by: Uiniel <174327181+uiniel@users.noreply.github.com>
Gae24
reviewed
Mar 12, 2026
| let in_realm_proof = AlreadyInRealm::assert::<crate::DomTypeHolder>(); | ||
| let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), can_gc); | ||
| let p = | ||
| Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), CanGc::from_cx(cx)); |
Contributor
There was a problem hiding this comment.
Suggested change
| Promise::new_in_current_realm(InRealm::Already(&in_realm_proof), CanGc::from_cx(cx)); | |
| Promise::new_in_realm(cx); |
| 'canGc': ['Slice', 'Text', 'ArrayBuffer', 'Stream', 'Bytes'], | ||
| 'canGc': ['ArrayBuffer', 'Bytes'], | ||
| 'inRealms': ['Bytes', 'ArrayBuffer'], | ||
| 'cx': ['Stream', 'Slice', 'Text', 'Constructor'] |
Contributor
There was a problem hiding this comment.
Since Text creates a Promise we need to move it to 'realm': ['Text']
| let task = task!(resolve_promise: move || { | ||
| let task = task!(resolve_promise: move |cx| { | ||
| let promise = trusted_promise.root(); | ||
| let _ac = enter_realm(&*promise.global()); |
Contributor
There was a problem hiding this comment.
Let's call enter_auto_realm(cx, promise.global()) here.
Contributor
Author
There was a problem hiding this comment.
This change would result in two mutable borrows of cx, because _ac is dropped after the call to callback. I'm also not familiar enough with the code to understand why enter_realm is needed here or if it is still needed after changing CanGc::note to CanGc::from_cx in the callback.
Contributor
There was a problem hiding this comment.
I think we still need it, you can fix the borrow issue by doing
let mut realm = enter_auto_realm(cx, promise.global());
let cx = &mut realm;
Contributor
Author
There was a problem hiding this comment.
Ah right thanks! I forgot that realms can also be used as a context.
| self.task_source.queue(task!(reject_promise: move || { | ||
| self.task_source.queue(task!(reject_promise: move |cx| { | ||
| let promise = trusted_promise.root(); | ||
| let _ac = enter_realm(&*promise.global()); |
Signed-off-by: Uiniel <174327181+uiniel@users.noreply.github.com>
Signed-off-by: Uiniel <174327181+uiniel@users.noreply.github.com>
offline-ant
pushed a commit
to offline-ant/havi
that referenced
this pull request
Jun 4, 2026
Move from CanGc to &mut js::context:JSContext. `ArrayBuffer` and `Bytes` require many changes in `dom/stream` for which I'm going to create a seperate pull request before porting the two methods. Testing: Just a refactor, `./mach test-unit` still passes. Fixes: Part of servo#42638 --------- Signed-off-by: Uiniel <174327181+uiniel@users.noreply.github.com> (cherry picked from commit 0f5e020)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Move from CanGc to &mut js::context:JSContext.
ArrayBufferandBytesrequire many changes indom/streamfor which I'm going to create a seperate pull request before porting the two methods.Testing: Just a refactor,
./mach test-unitstill passes.Fixes: Part of #42638