Skip to content

script: don't store a Window inside RefreshRedirectDue - #46633

Merged
mrobinson merged 5 commits into
servo:mainfrom
Gae24:refresh-redirect-unrooted
Jul 19, 2026
Merged

script: don't store a Window inside RefreshRedirectDue#46633
mrobinson merged 5 commits into
servo:mainfrom
Gae24:refresh-redirect-unrooted

Conversation

@Gae24

@Gae24 Gae24 commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

Part of #39139, instead of replacing DomRoot with Dom, simply remove it and pass down a GlobalScope ref when the callback is invoked.
Additionally, the generic parameter of invoke is removed, since this is always a GlobalScope.

Testing: It compiles

Gae24 added 4 commits July 19, 2026 11:45
@Gae24
remove Window from RefreshRedirectDue
3ade9e1 
Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
@Gae24
remove generic parameter from OneshotTimerCallback::invoke
0ca55d6 
Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
@Gae24
remove GlobalScope parameter from fire_timer
c45c3d5 
Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
@Gae24
remove generic parameter from JsTimerTask::invoke
013b576 
Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
@Gae24
Gae24 requested a review from gterzian as a code owner July 19, 2026 11:08
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 19, 2026
@Gae24

Gae24 commented Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Successful wpt run https://github.com/Gae24/servo/actions/runs/29682264360

mrobinson
mrobinson approved these changes Jul 19, 2026
View reviewed changes

@mrobinson mrobinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. Just a couple comments before merging:

Comment thread components/script/dom/document/document.rs Outdated
Comment thread components/script/timers.rs Outdated
@servo-highfive servo-highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Jul 19, 2026
@Gae24
apply review suggestions
264a316 
Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 19, 2026
@servo-highfive servo-highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Jul 19, 2026
@mrobinson
mrobinson enabled auto-merge July 19, 2026 15:12
@mrobinson
mrobinson added this pull request to the merge queue Jul 19, 2026
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 19, 2026
Merged via the queue into servo:main with commit 1cc0c3b Jul 19, 2026
34 checks passed
@servo-highfive servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 19, 2026
@Gae24
Gae24 deleted the refresh-redirect-unrooted branch July 21, 2026 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrobinson mrobinson mrobinson approved these changes
@gterzian gterzian Awaiting requested review from gterzian gterzian is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Gae24 @mrobinson @servo-highfive