firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Impeller] dont cache glyph layout if atlas is invalid. (flutter/engine#56879)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/159578

When the screen is shut off, the atlas context is destroyed but the text frames are not. This can lead to a state where we expect the glyph atlas to be populated but it is not. make sure to check if the atlas itself is valid.
This commit is contained in:
Jonah Williams 2024-12-02 09:39:09 -08:00 committed by GitHub
parent d28811c8f3
commit effea219cb
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/impeller/typographer/backends/skia/typographer_context_skia.cc
View File

@ -415,7 +415,7 @@ TypographerContextSkia::CollectNewGlyphs(
std::vector<Rect> glyph_sizes; std::vector<Rect> glyph_sizes;
size_t generation_id = atlas->GetAtlasGeneration(); size_t generation_id = atlas->GetAtlasGeneration();
for (const auto& frame : text_frames) { for (const auto& frame : text_frames) {
if (frame->IsFrameComplete() && if (atlas->IsValid() && frame->IsFrameComplete() &&
frame->GetAtlasGeneration() == generation_id && frame->GetAtlasGeneration() == generation_id &&
!frame->GetFrameBounds(0).is_placeholder) { !frame->GetFrameBounds(0).is_placeholder) {
continue; continue;

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

@ -612,6 +612,49 @@ TEST_P(TypographerTest, TextFrameAtlasGenerationTracksState) {
EXPECT_EQ(frame->GetAtlasGeneration(), 2u); EXPECT_EQ(frame->GetAtlasGeneration(), 2u);
} }
TEST_P(TypographerTest, InvalidAtlasForcesRepopulation) {
SkFont font = flutter::testing::CreateTestFontOfSize(12);
auto blob = SkTextBlob::MakeFromString(
"the quick brown fox jumped over the lazy dog.", font);
ASSERT_TRUE(blob);
auto frame = MakeTextFrameFromTextBlobSkia(blob);
EXPECT_FALSE(frame->IsFrameComplete());
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto atlas = CreateGlyphAtlas(*GetContext(), context.get(), *host_buffer,
GlyphAtlas::Type::kAlphaBitmap, /*scale=*/1.0f,
atlas_context, frame);
// The glyph position in the atlas was not known when this value
// was recorded. It is marked as a placeholder.
EXPECT_TRUE(frame->IsFrameComplete());
EXPECT_TRUE(frame->GetFrameBounds(0).is_placeholder);
if (GetBackend() == PlaygroundBackend::kOpenGLES) {
// OpenGLES must always increase the atlas backend if the texture grows.
EXPECT_EQ(frame->GetAtlasGeneration(), 1u);
} else {
EXPECT_EQ(frame->GetAtlasGeneration(), 0u);
}
auto second_context = TypographerContextSkia::Make();
auto second_atlas_context =
second_context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
EXPECT_FALSE(second_atlas_context->GetGlyphAtlas()->IsValid());
atlas = CreateGlyphAtlas(*GetContext(), second_context.get(), *host_buffer,
GlyphAtlas::Type::kAlphaBitmap, /*scale=*/1.0f,
second_atlas_context, frame);
EXPECT_TRUE(second_atlas_context->GetGlyphAtlas()->IsValid());
}
} // namespace testing } // namespace testing
} // namespace impeller } // namespace impeller