++

impeller/typographer/backends/skia/text_render_context_skia.cc

@@ -4,7 +4,6 @@
 
 #include "impeller/typographer/backends/skia/text_render_context_skia.h"
 
-#include <iostream>
 #include <utility>
 
 #include "flutter/fml/logging.h"
@@ -330,7 +329,6 @@ bool UploadGlyphTextureAtlas(const std::shared_ptr<Texture>& texture,
   auto texture_descriptor = texture->GetTextureDescriptor();
   if (pixmap.rowBytes() * pixmap.height() !=
       texture_descriptor.GetByteSizeOfBaseMipLevel()) {
-    std::cerr << "descriptor mismatch" << std::endl;
     return false;
   }
 
@@ -341,7 +339,6 @@ bool UploadGlyphTextureAtlas(const std::shared_ptr<Texture>& texture,
   );
 
   if (!texture->SetContents(mapping)) {
-    std::cerr << "contents cant be set" << std::endl;
     return false;
   }
   return true;
@@ -440,17 +437,11 @@ std::shared_ptr<GlyphAtlas> TextRenderContextSkia::CreateGlyphAtlas(
   auto old_texture = last_atlas->GetTexture();
   if (old_texture != nullptr &&
       old_texture->GetTextureDescriptor().size == atlas_size) {
-    std::cerr << "reuse atlas" << std::endl;
     if (!UploadGlyphTextureAtlas(old_texture, bitmap)) {
       return nullptr;
     }
     glyph_atlas->SetTexture(std::move(old_texture));
   } else {
-    std::cerr << "can't reuse "
-              << (old_texture != nullptr
-                      ? old_texture->GetTextureDescriptor().size
-                      : ISize(0, 0))
-              << " : " << atlas_size << std::endl;
     auto texture = CreateGlyphTextureAtlas(GetContext()->GetResourceAllocator(),
                                            atlas_size, format);
     if (!texture || !UploadGlyphTextureAtlas(texture, bitmap)) {

impeller/typographer/typographer_unittests.cc

@@ -137,6 +137,34 @@ TEST_P(TypographerTest, GlyphAtlasIsRecycledIfUnchanged) {
   ASSERT_EQ(atlas_context->GetGlyphAtlas(), atlas);
 }
 
+TEST_P(TypographerTest, GlyphAtlasTextureIsRecycledIfUnchanged) {
+  auto context = TextRenderContext::Create(GetContext());
+  auto atlas_context = std::make_shared<GlyphAtlasContext>();
+  ASSERT_TRUE(context && context->IsValid());
+  SkFont sk_font;
+  auto blob = SkTextBlob::MakeFromString("spooky skellingtons", sk_font);
+  ASSERT_TRUE(blob);
+  auto atlas =
+      context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap, atlas_context,
+                                TextFrameFromTextBlob(blob));
+  ASSERT_NE(atlas, nullptr);
+  ASSERT_NE(atlas->GetTexture(), nullptr);
+  ASSERT_EQ(atlas, atlas_context->GetGlyphAtlas());
+
+  auto* first_texture = atlas->GetTexture().get();
+
+  // now create a new glyph atlas with a nearly identical blob.
+
+  auto blob2 = SkTextBlob::MakeFromString("spooky skellington2", sk_font);
+  auto next_atlas =
+      context->CreateGlyphAtlas(GlyphAtlas::Type::kAlphaBitmap, atlas_context,
+                                TextFrameFromTextBlob(blob2));
+  ASSERT_NE(atlas, next_atlas);
+  auto* second_texture = next_atlas->GetTexture().get();
+
+  ASSERT_EQ(second_texture, first_texture);
+}
+
 TEST_P(TypographerTest, GlyphAtlasWithLotsOfdUniqueGlyphSize) {
   auto context = TextRenderContext::Create(GetContext());
   auto atlas_context = std::make_shared<GlyphAtlasContext>();