Skip to content

Conversation

@nicoburns
Copy link

Changes made:

  • Update webrender and in-repo crates that are dependencies of webrender to version 0.68
  • Update these crates to use workspace depency versions similar to stylo#249 (seeing as the feedback on that change was positive).

I have not bothered updating the versions of the other in-repo crates that are not dependencies of webrender (e.g. wrench and crates that are used by wrench like swgl) as we don't need to publish those and thus their version numbers don't matter, and I figured it would keep the diff a little smaller. But it would be easy to update those too if we wanted to.

version.workspace = true
authors = ["Glenn Watson <[email protected]>"]
license = "MPL-2.0"
repository = "https://github.com/servo/webrender"
Copy link
Member

Choose a reason for hiding this comment

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

Should we perhaps update the description to mention this is servos fork of webrender? And perhaps remove authors, since it's not a required field (anymore) and not quite accurate?

Copy link
Author

Choose a reason for hiding this comment

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

I think we probably don't need to mention that we're technically a fork. Even though Firefox/Gecko is upstream these days, they don't publish WebRender to crates.io, and if WebRender is like Stylo then their version can't easily be built outside of their tree (it depends on other C++ code in Gecko). So as far as crates.io consumers are concerned, Servo's version is the canonical version.

@jschwe
Copy link
Member

jschwe commented Jan 22, 2026

And last comment, perhaps update the upstream URL in the readme to point to the new upstream at https://github.com/mozilla-firefox/firefox/

@nicoburns
Copy link
Author

And last comment, perhaps update the upstream URL in the readme to point to the new upstream at https://github.com/mozilla-firefox/firefox/

I've done this. Although note that this PR is against the 0.68 branch (which is what we're using in Servo), not the main branch (which currently contains a very old version of WebRender, but is what Github shows as the README).

We should probably make the main branch the same as the 0.68 branch.

@mrobinson mrobinson merged commit 6ea1142 into 0.68 Jan 27, 2026
4 checks passed
@mrobinson
Copy link
Member

mrobinson commented Jan 28, 2026

I've amended this to not upgrade the versions of wr_malloc_size_of as the Mozilla project publishes the crate from upstream sometimes and the versions should not diverge.

@mrobinson
Copy link
Member

I have released WebRender 0.68 now, though I had to make some changes. I've merged them into this commit in the branch.

@nicoburns
Copy link
Author

nicoburns commented Jan 28, 2026

@mrobinson Thanks!

Could we set the main branch to the contents of the 0.68 branch? I think it's very confusing for people when they hit the repo's main page and see a very old version. Looks like there may a couple of commits (c4bd5b4 and e1c924e) that are only on main but not 0.68, but they look like they should be easy enough to cherry-pick across.

@mrobinson
Copy link
Member

The issue is that because we are constantly resyncing with upstream, the main branch will have its history rewritten. Perhaps it is better to simply update the README in the main branch. In addition, I think we should look into merging our changes upstream and archiving this repository entirely.

@nicoburns
Copy link
Author

Updating the README (and perhaps deleting the code entirely) in the main branch would also work.

But this is effectively exactly the same issue as we have with Stylo, right? (except we sync less often and the diff is smaller). So I figured it could make sense to use the same solution here as we use there.

Getting rid of the repo entirely could make sense, except we probably don't want to have to coordinate with upstream to make releases? And it might be good to have a record of the code that was released?

(I also think we're also going to continue to need at least some Cargo.toml patches on top of upstream so as to strip out the Gecko-specific code (e.g. firefox-on-glean))

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants