This repository was archived by the owner on Feb 25, 2025. It is now read-only.
[Impeller] fix colr/bitmap font color drawing. #52871
Merged
Conversation
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
jonahwilliams
commented
May 17, 2024
impeller/geometry/color.h
Outdated
| @@ -253,6 +253,11 @@ struct Color { | |||
| return {r, g, b, a}; | |||
| } | |||
|
|
|||
| constexpr uint32_t ToSkia() const { | |||
There was a problem hiding this comment.
I should probably call this ToARGB
jonahwilliams
commented
May 17, 2024
| @@ -60,6 +63,8 @@ class TextFrame { | |||
| /// to apply opacity peephole optimizations to text blobs. | |||
| bool MaybeHasOverlapping() const; | |||
|
|
|||
| Color GetColor() const; | |||
There was a problem hiding this comment.
need doc comment.
added 2 commits
May 17, 2024 10:38
…engine into support_glyphs_with_color
matanlurey
approved these changes
May 17, 2024
jason-simmons
approved these changes
May 17, 2024
| @@ -40,15 +41,17 @@ struct FontGlyphPair { | |||
| template <> | |||
| struct std::hash<impeller::ScaledFont> { | |||
| constexpr std::size_t operator()(const impeller::ScaledFont& sf) const { | |||
| return fml::HashCombine(sf.font.GetHash(), sf.scale); | |||
| return fml::HashCombine(sf.font.GetHash(), sf.scale, sf.color.red, | |||
There was a problem hiding this comment.
Can simplify by calling sf.color.ToARGB() here
There was a problem hiding this comment.
Ahh good idea!
jonahwilliams
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
May 17, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
May 17, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
May 17, 2024
…148581) flutter/engine@5b3bf9a...93f1b5a 2024-05-17 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from ywxGmpIdjxBl2i7s2... to jKdOTTgE2Uq5OmJzT... (flutter/engine#52909) 2024-05-17 jonahwilliams@google.com [Impeller] fix colr/bitmap font color drawing. (flutter/engine#52871) 2024-05-17 skia-flutter-autoroll@skia.org Roll Skia from 6f7cb3d360b7 to 3f4c5038da37 (1 revision) (flutter/engine#52907) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from ywxGmpIdjxBl to jKdOTTgE2Uq5 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 bdero@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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes flutter/flutter#126546
Track the paint color used by Bitmap/Emoji/COLR fonts and use it as a cache key. This allows non-COLR glyphs in a COLR font to get the correct text color. For other kinds of fonts, we always record the color as black so there are no cache efficiency hits in general.