Skip to content

Conversation

@RichardTjokroutomo
Copy link

Enable text-overflow for Servo. Companion PR: #40448

delan and others added 24 commits October 1, 2025 22:37
Any ancestors of this commit are from upstream mozilla-central, with
some filtering and renaming. Our patches and sync tooling start here.

The sync tooling has all been squashed into this commit, based on:
https://github.com/servo/stylo/commits/64731e10dc8ef87ef52aa2fb9f988c3b2530f3a7
This is a rebase of d10ddec

Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Oriol Brufau <[email protected]>
* Define main version number at the workspace level

This is the version number that most of the Stylo packages follow

* Define in-repo dependencies at the workspace level

* Add back newline at end of workspace Cargo.toml

Signed-off-by: Nico Burns <[email protected]>

---------

Signed-off-by: Nico Burns <[email protected]>
This patch does various things:
 - Unifies the definitions and implementations of `ImportSheet` among
   Gecko and Servo. In particular, Servo gains `ImportSheet::Pending`.
 - Removes unsound `StylesheetContents::from_data()`, which we were
   keeping as a diff from upstream.
 - Removes `Stylesheet::update_from_bytes`. It was only used by Servo,
   which will no longer need it.

Signed-off-by: Oriol Brufau <[email protected]>
…ter (servo#251)

It was previously taking a `MediaList` parameter, and then wrap it in
a locked arc. This was suboptimal for callers that already have an
`Arc<Locked<MediaList>>`.

Signed-off-by: Oriol Brufau <[email protected]>
It's no longer needed.

Signed-off-by: Oriol Brufau <[email protected]>
* Add all_styles_equal check

Signed-off-by: Nico Burns <[email protected]>

* Optimise generated damage computations

Signed-off-by: Nico Burns <[email protected]>

* Use simple ptr::eq instead of styles_may_differ check

* Remove optimisation that assumes diff ptr = diff styles

Signed-off-by: Nico Burns <[email protected]>

---------

Signed-off-by: Nico Burns <[email protected]>
* Bug 1995268 - Make StylesheetContents more obviously immutable. r=nicoburns,oriol,#style

I want to update the UrlExtraData of the stylesheet contents when
cloning for uniqueness.

This removes an API that servo uses but that's easily replaceable, see:
servo/servo#40024

Differential Revision: https://phabricator.services.mozilla.com/D269200

* Bug 1995304 - Simplify and clean-up stylesheet collection iteration. r=#style,Oriol,nicoburns

I want the iter_mut() methods to fix
servo/servo#40024.

But we can simplify this a little bit nowadays to avoid duplicating a
lot of code.

Differential Revision: https://phabricator.services.mozilla.com/D269226

* Bug 1995525 - Tweak stylo APIs to make it easier for servo to replace the StylesheetContents without needing a whole new stylesheet. r=oriol,nicoburns,#style

Put the Arc<StylesheetContents> under a Locked<T> so that Servo can
replace it.

Differential Revision: https://phabricator.services.mozilla.com/D269382
Copy link
Collaborator

@Loirooriol Loirooriol left a comment

Choose a reason for hiding this comment

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

Looks good, but let's wait until the Servo PR is ready to land

@RichardTjokroutomo
Copy link
Author

BTW, I re-opened the Servo PR: # 40526

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.

5 participants