This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Make SkFontMgr subclasses flexible for sk_sp#40556
Merged
brianosman merged 1 commit intoflutter:mainfrom Mar 23, 2023
Merged
Conversation
Skia is changing SkFontMgr and SkFontStyleSet methods to consistently return sk_sp<SkTypeface> and sk_sp<SkFontStyleSet> instead of SkTypeface* and SkFontStyleSet*. The pointers returned always needed to be SkSafeUnref'ed but with sk_sp this ownership is now explicit. Flutter subclasses both SkFontMgr and SkFontStyleSet and overrides affected methods. Normally Skia would roll out this change behind a build flag which would first be set in Flutter (to hold out the change), Skia then rolled into Flutter, then the build flag removed from Flutter (along with updating the subclasses). However, this is made quite difficult and slow because of the need to also be compatible with Flutter in other repositories at the same time. Instead, this change updates the subclasses to infer the correct return types in a way that will work both with and without the Skia change. After the Skia change is landed and rolled into Flutter the subclasses will be re-simplified to match the new method signatures. [0] https://skia-review.googlesource.com/c/skia/+/659856
|
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!). If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
brianosman
approved these changes
Mar 23, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Mar 23, 2023
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
Skia is changing
SkFontMgrandSkFontStyleSetmethods to consistently returnsk_sp<SkTypeface>andsk_sp<SkFontStyleSet>instead ofSkTypeface*andSkFontStyleSet*. The pointers returned always needed to beSkSafeUnrefed but withsk_spthis ownership is now explicit.Flutter subclasses both
SkFontMgrandSkFontStyleSetand overrides affected methods. Normally Skia would roll out this change behind a build flag which would first be set in Flutter (to hold out the change), Skia then rolled into Flutter, then the build flag removed from Flutter (along with updating the subclasses). However, this is made quite difficult and slow because of the need to also be compatible with Flutter in other repositories at the same time. Instead, this change updates the subclasses to infer the correct return types in a way that will work both with and without the Skia change. After the Skia change is landed and rolled into Flutter the subclasses will be re-simplified to match the new method signatures.[0] https://skia-review.googlesource.com/c/skia/+/659856