Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix text missing in performance overlay (on Android) #49035

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

kjlubick
Copy link
Contributor

The Android fontmgr does not return a default typeface when a nullptr style is passed in [1] (I'm not sure if this is a feature or a bug). However, calling legacyMakeTypeface will use a default sans-serif font. This adds in that backup behavior.

[1] https://github.com/google/skia/blob/4170fba2d89fc0319aad5702a15acdee4470f606/src/ports/SkFontMgr_android.cpp#L310-L312

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@flutter-dashboard
Copy link

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 "@text-exemption-reviewers" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use 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.

@flar
Copy link
Contributor

flar commented Dec 14, 2023

I'm doing builds to verify. Hope to have it tested in the next 10-15 minutes.

@flar
Copy link
Contributor

flar commented Dec 14, 2023

It would be nice to have an automated test for this. If we can't find a way to come up with one then we need to document why and ask for a test exemption in Discord.

@kjlubick
Copy link
Contributor Author

Could we add a golden image test? (I'm not super sure how to do that in Flutter). @Piinks probably knows or can point us at the right person.

@Piinks
Copy link
Contributor

Piinks commented Dec 14, 2023

can point us at the right person.

Absolutely! :) I am not familiar with engine goldens, but @mdebbar is!

@flar
Copy link
Contributor

flar commented Dec 14, 2023

I have done manual verification of your branch locally and the text renders on MacOS, iOS and Android with the fix.

@chinmaygarde
Copy link
Member

@flar Mentions that this would fail by tripping the DCHECK in unopt modes on Android. But I am not sure if there such a test harness for it. Triagers couldn't find a good testing strategy. I am fine landing as-is with the instructions in the bots message.

@matanlurey
Copy link
Contributor

I am happy to take over writing a test, it was blocked on infra that should now be available thanks to @dnfield.

Filed: flutter/flutter#140182.

@kjlubick kjlubick merged commit 9524a18 into flutter:main Dec 15, 2023
26 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 15, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Dec 15, 2023
…140217)

flutter/engine@7a50221...9524a18

2023-12-15 kjlubick@users.noreply.github.com Fix text missing in performance overlay (on Android) (flutter/engine#49035)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC jsimmons@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants