fonts: Remove web fonts when their stylesheet is removed #32346
Merged
Conversation
This file contains 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
mrobinson
added
T-linux-wpt-2013
github-actions
bot
removed
T-linux-wpt-2013
|
🔨 Triggering try run (#9190661994) for Linux WPT |
mukilan
changed the title
mrobinson
force-pushed
the
clean-up-fonts-on-remove-stylesheet
branch
from
c1d7fff
to
b6958b0
Compare
mrobinson
added
T-linux-wpt-2013
github-actions
bot
removed
T-linux-wpt-2013
|
🔨 Triggering try run (#9190999686) for Linux WPT |
|
Test results for linux-wpt-layout-2013 from try job (#9190661994): Flaky unexpected result (13)
Stable unexpected results that are known to be intermittent (12)
|
|
Test results for linux-wpt-layout-2020 from try job (#9190661994): Flaky unexpected result (20)
Stable unexpected results that are known to be intermittent (10)
|
|
✨ Try run (#9190661994) succeeded. |
|
Test results for linux-wpt-layout-2013 from try job (#9190999686): Flaky unexpected result (13)
Stable unexpected results that are known to be intermittent (13)
|
|
Test results for linux-wpt-layout-2020 from try job (#9190999686): Flaky unexpected result (16)
Stable unexpected results that are known to be intermittent (15)
|
|
✨ Try run (#9190999686) succeeded. |
mrobinson
force-pushed
the
clean-up-fonts-on-remove-stylesheet
branch
from
b6958b0
to
278b758
Compare
|
I have added a test for this change. |
|
🤖 Opened new upstream WPT pull request (web-platform-tests/wpt#46437) with upstreamable changes. |
mukilan
approved these changes
May 23, 2024
components/gfx/font_store.rs
Outdated
|
|
||
| let family_name = state.css_font_face_descriptors.family_name.clone(); | ||
| self.families | ||
| .entry(family_name.clone()) |
There was a problem hiding this comment.
Suggested change
| .entry(family_name.clone()) | |
| .entry(family_name)) |
There was a problem hiding this comment.
Fixed this as well as a couple other places where we didn't need to pass as a reference.
components/gfx/font_store.rs
Outdated
| @@ -127,4 +201,14 @@ impl FontTemplates { | |||
| self.templates | |||
| .push(Arc::new(AtomicRefCell::new(new_template))); | |||
| } | |||
|
|
|||
| pub(crate) fn remove_add_templates_for_stylesheet( | |||
There was a problem hiding this comment.
Suggested change
| pub(crate) fn remove_add_templates_for_stylesheet( | |
| pub(crate) fn remove_templates_for_stylesheet( |
mrobinson
force-pushed
the
clean-up-fonts-on-remove-stylesheet
branch
from
278b758
to
520c0b0
Compare
|
📝 Transplanted new upstreamable changes to existing upstream WPT pull request (web-platform-tests/wpt#46437). |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
This is the first part of ensuring that unused fonts do not leak. This change makes it so that when a stylesheet is removed, the corresponding web fonts are removed from the `FontContext`. Note: WebRender assets are still leaked, which was the situation before for all fonts. A followup change will fix this issue. Fixes servo#15139. Signed-off-by: Martin Robinson <[email protected]> Co-authored-by: Mukilan Thiyagarajan <[email protected]>
mrobinson
force-pushed
the
clean-up-fonts-on-remove-stylesheet
branch
from
520c0b0
to
2448611
Compare
|
📝 Transplanted new upstreamable changes to existing upstream WPT pull request (web-platform-tests/wpt#46437). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is the first part of ensuring that unused fonts do not leak. This
change makes it so that when a stylesheet is removed, the corresponding
web fonts are removed from the
FontContext.Note: WebRender assets are still leaked, which was the situation before
for all fonts. A followup change will fix this issue.
Fixes #15139.
Signed-off-by: Martin Robinson [email protected]
Co-authored-by: Mukilan Thiyagarajan [email protected]
./mach build -ddoes not report any errors./mach test-tidydoes not report any errors