Make SkFontMgr subclasses flexible for sk_sp #40556
Merged
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
SkFontMgr
andSkFontStyleSet
methods to consistently returnsk_sp<SkTypeface>
andsk_sp<SkFontStyleSet>
instead ofSkTypeface*
andSkFontStyleSet*
. The pointers returned always needed to beSkSafeUnref
ed but withsk_sp
this ownership is now explicit.Flutter subclasses both
SkFontMgr
andSkFontStyleSet
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