libservo: Expand the UserContentManager API.#42288
Merged
mukilan merged 1 commit intoservo:mainfrom Feb 5, 2026
Merged
Conversation
mukilan
requested review from
Loirooriol,
atbrakhi,
gterzian and
mrobinson
as code owners
servo-highfive
added
the
S-awaiting-review
mukilan
force-pushed
the
user-content-api-enhancements
branch
from
7ae9516 to
c7b8b4c
Compare
mukilan
commented
Feb 4, 2026
mrobinson
approved these changes
Feb 5, 2026
Member
mrobinson
left a comment
mrobinson
left a comment
There was a problem hiding this comment.
Looks good with a couple small things:
| static USER_STYLE_SHEET_ID: AtomicU32 = AtomicU32::new(1); | ||
|
|
||
| #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf, PartialEq, Serialize)] | ||
| pub struct UserStyleSheetId(u32); |
Member
There was a problem hiding this comment.
I think make this private now as it's no longer necessary to expose it.
Member
Author
There was a problem hiding this comment.
This type is referenced in the UserContentManagerAction enum that is used in the embedder->constellation message, so this needs to be public.
Comment on lines
+65
to
+69
| /// Returns the `UserStyleSheetId` of this `UserStyleSheet`. This can be used to remove the | ||
| /// user stylesheet from the `UserContentManager`. | ||
| pub fn id(&self) -> UserStyleSheetId { | ||
| self.id | ||
| } |
Member
There was a problem hiding this comment.
I would remove this as the embedder doesn't need to know about the id (at least yet).
Member
Author
There was a problem hiding this comment.
True, but it is currently used by constellation to filter out the removed UserScripts and UserStyleSheets from the Constellation's state when it receives the UserContentManagerAction message due to a mutation.
Member
There was a problem hiding this comment.
Ah, right. Maybe just use #[doc(hidden)] for this then.
| static USER_SCRIPT_ID: AtomicU32 = AtomicU32::new(1); | ||
|
|
||
| #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf, PartialEq, Serialize)] | ||
| pub struct UserScriptId(u32); |
servo-highfive
removed
the
S-awaiting-review
mukilan
force-pushed
the
user-content-api-enhancements
branch
from
c7b8b4c to
5383c66
Compare
servo-highfive
added
the
S-awaiting-review
Member
Author
|
Thanks for the review @mrobinson! I've addressed the recent review comments and pushed the changes, but looks like you might need to approve the new changes again, as the PR doesn't seem to get added to the merge queue automatically. |
mrobinson
approved these changes
Feb 5, 2026
servo-highfive
added
S-awaiting-merge
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 5, 2026
The patch adds the following functionality to the per-WebView `UserContentManager` API. - Removing a `UserScript` at that was previously added. - Adding a new `UserStyleSheet` representing a user-origin style sheet. allow removing user script - Removing a previously added `UserStyleSheet`. There might be scope for some improvements in the API: - `UserScript` and `UserStyleSheet` have different ways of representing the source location - a `PathBuf` and `Url` respectively. This is due to how those values are used by the underlying evaluation APIs in script and stylo. More investigation is needed here and could be addressed in future patches. Testing: New unit tests are added for the user stylesheet APIs. Existing tests have been updated to test the removal of user scripts.
Member
|
@mukilan Very odd. That wasn't a requirement before. This seems like it's a change to GitHub, a GitHub bug, or a change in our project configuration that I didn't know about. In any case, it's in the MQ now. |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
servo-highfive
added
S-tests-failed
mukilan
force-pushed
the
user-content-api-enhancements
branch
from
5383c66 to
b13e136
Compare
servo-highfive
added
S-awaiting-review
The patch adds the following functionality to the per-WebView `UserContentManager` API. - Removing a `UserScript` at that was previously added. - Adding a new `UserStyleSheet` representing a user-origin style sheet. allow removing user script - Removing a previously added `UserStyleSheet`. There might be scope for some improvements in the API: - `UserScript` and `UserStyleSheet` have different ways of representing the source location - a `PathBuf` and `Url` respectively. This is due to how those values are used by the underlying evaluation APIs in script and stylo. More investigation is needed here and could be addressed in future patches. Testing: New unit tests are added for the user stylesheet APIs. Exisiting tests have been updated to test the removal of user scripts. Signed-off-by: Mukilan Thiyagarajan <[email protected]> review comments
mukilan
force-pushed
the
user-content-api-enhancements
branch
from
b13e136 to
b4f6e09
Compare
servo-highfive
added
the
S-awaiting-merge
servo-highfive
removed
the
S-awaiting-merge
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.
The patch adds the following functionality to the per-WebView
UserContentManagerAPI.UserScriptat that was previously added.UserStyleSheetrepresenting a user-origin style sheet. allow removing user scriptUserStyleSheet.There might be scope for some improvements in the API:
UserScriptandUserStyleSheethave different ways of representing the source location - aPathBufandUrlrespectively. This is due to how those values are used by the underlying evaluation APIs in script and stylo. More investigation is needed here and could be addressed in future patches.Testing: New unit tests are added for the user stylesheet APIs. Existing tests have been updated to test the removal of user scripts.