DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] ensure glyph type contributes to FontGlyphPair hash/eq (flutter/engine#39794)

Browse Source
This commit is contained in:
Jonah Williams 2023-02-22 11:38:18 -08:00 committed by GitHub
parent 74e5f8be04
commit dfe1adf710
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/flutter/impeller/typographer/font_glyph_pair.h
View File

@ -31,12 +31,13 @@ struct FontGlyphPair {
struct Hash {
std::size_t operator()(const FontGlyphPair& p) const {
return fml::HashCombine(p.font.GetHash(), p.glyph);
return fml::HashCombine(p.font.GetHash(), p.glyph.index, p.glyph.type);
}
};
struct Equal {
bool operator()(const FontGlyphPair& lhs, const FontGlyphPair& rhs) const {
return lhs.font.IsEqual(rhs.font) && lhs.glyph.index == rhs.glyph.index;
return lhs.font.IsEqual(rhs.font) && lhs.glyph.index == rhs.glyph.index &&
lhs.glyph.type == rhs.glyph.type;
}
};
};

11
engine/src/flutter/impeller/typographer/glyph.h
View File

@ -7,6 +7,7 @@
#include <cstdint>
#include <functional>
#include "flutter/fml/hash_combine.h"
#include "flutter/fml/macros.h"
#include "impeller/geometry/rect.h"
@ -43,7 +44,15 @@ struct Glyph {
template <>
struct std::hash<impeller::Glyph> {
constexpr std::size_t operator()(const impeller::Glyph& g) const {
return g.index;
return fml::HashCombine(g.index, g.type);
}
};
template <>
struct std::equal_to<impeller::Glyph> {
constexpr bool operator()(const impeller::Glyph& lhs,
const impeller::Glyph& rhs) const {
return lhs.index == rhs.index && lhs.type == rhs.type;
}
};

18
engine/src/flutter/impeller/typographer/typographer_unittests.cc
View File

@ -201,5 +201,23 @@ TEST_P(TypographerTest, GlyphAtlasTextureIsRecycledIfUnchanged) {
ASSERT_EQ(old_packer, new_packer);
}
TEST_P(TypographerTest, FontGlyphPairTypeChangesHashAndEquals) {
Font font = Font(nullptr, {});
FontGlyphPair pair_1 = {
.font = font,
.glyph = Glyph(0, Glyph::Type::kBitmap, Rect::MakeXYWH(0, 0, 1, 1))};
// Same glyph same type.
FontGlyphPair pair_2 = {
.font = font,
.glyph = Glyph(0, Glyph::Type::kBitmap, Rect::MakeXYWH(0, 0, 1, 1))};
// Same glyph different type.
FontGlyphPair pair_3 = {
.font = font,
.glyph = Glyph(0, Glyph::Type::kPath, Rect::MakeXYWH(0, 0, 1, 1))};
ASSERT_TRUE(FontGlyphPair::Equal{}(pair_1, pair_2));
ASSERT_FALSE(FontGlyphPair::Equal{}(pair_1, pair_3));
}
} // namespace testing
} // namespace impeller