Store text context in AiksPlayground

bdero · bdero · commit c2685a25c963 · 2023-08-21T17:18:40.000-07:00
diff --git a/impeller/aiks/aiks_context.cc b/impeller/aiks/aiks_context.cc
@@ -10,7 +10,7 @@
 namespace impeller {
 
 AiksContext::AiksContext(std::shared_ptr<Context> context,
-                         std::unique_ptr<TextRenderContext> text_render_context)
+                         std::shared_ptr<TextRenderContext> text_render_context)
     : context_(std::move(context)) {
   if (!context_ || !context_->IsValid()) {
     return;
diff --git a/impeller/aiks/aiks_context.h b/impeller/aiks/aiks_context.h
@@ -29,7 +29,7 @@ class AiksContext {
   ///                             text with Aiks will result in validation
   ///                             errors.
   AiksContext(std::shared_ptr<Context> context,
-              std::unique_ptr<TextRenderContext> text_render_context);
+              std::shared_ptr<TextRenderContext> text_render_context);
 
   ~AiksContext();
 
diff --git a/impeller/aiks/aiks_playground.cc b/impeller/aiks/aiks_playground.cc
@@ -4,41 +4,38 @@
 
 #include "impeller/aiks/aiks_playground.h"
 
-#include "impeller/aiks/aiks_context.h"
+#include <memory>
 
+#include "impeller/aiks/aiks_context.h"
 #include "impeller/typographer/backends/skia/text_render_context_skia.h"
+#include "impeller/typographer/text_render_context.h"
 #include "third_party/imgui/imgui.h"
 
 namespace impeller {
 
-AiksPlayground::AiksPlayground() = default;
+AiksPlayground::AiksPlayground()
+    : text_render_context_(TextRenderContextSkia::Make()) {}
 
 AiksPlayground::~AiksPlayground() = default;
 
-bool AiksPlayground::OpenPlaygroundHere(
-    const Picture& picture,
-    std::unique_ptr<TextRenderContext> text_render_context_override) {
-  auto text_context = text_render_context_override
-                          ? std::move(text_render_context_override)
-                          : TextRenderContextSkia::Make();
+void AiksPlayground::SetTextRenderContext(
+    std::shared_ptr<TextRenderContext> text_render_context) {
+  text_render_context_ = std::move(text_render_context);
+}
+
+bool AiksPlayground::OpenPlaygroundHere(const Picture& picture) {
   return OpenPlaygroundHere(
       [&picture](AiksContext& renderer, RenderTarget& render_target) -> bool {
         return renderer.Render(picture, render_target);
-      },
-      std::move(text_context));
+      });
 }
 
-bool AiksPlayground::OpenPlaygroundHere(
-    AiksPlaygroundCallback callback,
-    std::unique_ptr<TextRenderContext> text_render_context_override) {
+bool AiksPlayground::OpenPlaygroundHere(AiksPlaygroundCallback callback) {
   if (!switches_.enable_playground) {
     return true;
   }
 
-  auto text_context = text_render_context_override
-                          ? std::move(text_render_context_override)
-                          : TextRenderContextSkia::Make();
-  AiksContext renderer(GetContext(), std::move(text_context));
+  AiksContext renderer(GetContext(), text_render_context_);
 
   if (!renderer.IsValid()) {
     return false;
diff --git a/impeller/aiks/aiks_playground.h b/impeller/aiks/aiks_playground.h
@@ -8,6 +8,7 @@
 #include "impeller/aiks/aiks_context.h"
 #include "impeller/aiks/picture.h"
 #include "impeller/playground/playground_test.h"
+#include "impeller/typographer/text_render_context.h"
 
 namespace impeller {
 
@@ -20,15 +21,16 @@ class AiksPlayground : public PlaygroundTest {
 
   ~AiksPlayground();
 
-  bool OpenPlaygroundHere(const Picture& picture,
-                          std::unique_ptr<TextRenderContext>
-                              text_render_context_override = nullptr);
+  void SetTextRenderContext(
+      std::shared_ptr<TextRenderContext> text_render_context);
 
-  bool OpenPlaygroundHere(AiksPlaygroundCallback callback,
-                          std::unique_ptr<TextRenderContext>
-                              text_render_context_override = nullptr);
+  bool OpenPlaygroundHere(const Picture& picture);
+
+  bool OpenPlaygroundHere(AiksPlaygroundCallback callback);
 
  private:
+  std::shared_ptr<TextRenderContext> text_render_context_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(AiksPlayground);
 };
 
diff --git a/impeller/entity/contents/content_context.cc b/impeller/entity/contents/content_context.cc
@@ -162,7 +162,7 @@ static std::unique_ptr<PipelineT> CreateDefaultPipeline(
 
 ContentContext::ContentContext(
     std::shared_ptr<Context> context,
-    std::unique_ptr<TextRenderContext> text_render_context)
+    std::shared_ptr<TextRenderContext> text_render_context)
     : context_(std::move(context)),
       lazy_glyph_atlas_(
           std::make_shared<LazyGlyphAtlas>(std::move(text_render_context))),
diff --git a/impeller/entity/contents/content_context.h b/impeller/entity/contents/content_context.h
@@ -342,7 +342,7 @@ class ContentContext {
  public:
   explicit ContentContext(
       std::shared_ptr<Context> context,
-      std::unique_ptr<TextRenderContext> text_render_context);
+      std::shared_ptr<TextRenderContext> text_render_context);
 
   ~ContentContext();
 
diff --git a/impeller/entity/entity_playground.cc b/impeller/entity/entity_playground.cc
@@ -10,16 +10,22 @@
 
 namespace impeller {
 
-EntityPlayground::EntityPlayground() = default;
+EntityPlayground::EntityPlayground()
+    : text_render_context_(TextRenderContextSkia::Make()) {}
 
 EntityPlayground::~EntityPlayground() = default;
 
+void EntityPlayground::SetTextRenderContext(
+    std::shared_ptr<TextRenderContext> text_render_context) {
+  text_render_context_ = std::move(text_render_context);
+}
+
 bool EntityPlayground::OpenPlaygroundHere(EntityPass& entity_pass) {
   if (!switches_.enable_playground) {
     return true;
   }
 
-  ContentContext content_context(GetContext(), TextRenderContextSkia::Make());
+  ContentContext content_context(GetContext(), text_render_context_);
   if (!content_context.IsValid()) {
     return false;
   }
@@ -35,7 +41,7 @@ bool EntityPlayground::OpenPlaygroundHere(Entity entity) {
     return true;
   }
 
-  ContentContext content_context(GetContext(), TextRenderContextSkia::Make());
+  ContentContext content_context(GetContext(), text_render_context_);
   if (!content_context.IsValid()) {
     return false;
   }
@@ -50,7 +56,7 @@ bool EntityPlayground::OpenPlaygroundHere(EntityPlaygroundCallback callback) {
     return true;
   }
 
-  ContentContext content_context(GetContext(), TextRenderContextSkia::Make());
+  ContentContext content_context(GetContext(), text_render_context_);
   if (!content_context.IsValid()) {
     return false;
   }
diff --git a/impeller/entity/entity_playground.h b/impeller/entity/entity_playground.h
@@ -4,12 +4,13 @@
 
 #pragma once
 
+#include "impeller/playground/playground_test.h"
+
 #include "flutter/fml/macros.h"
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
 #include "impeller/entity/entity_pass.h"
-
-#include "impeller/playground/playground_test.h"
+#include "impeller/typographer/text_render_context.h"
 
 namespace impeller {
 
@@ -22,13 +23,18 @@ class EntityPlayground : public PlaygroundTest {
 
   ~EntityPlayground();
 
+  void SetTextRenderContext(
+      std::shared_ptr<TextRenderContext> text_render_context);
+
   bool OpenPlaygroundHere(Entity entity);
 
   bool OpenPlaygroundHere(EntityPass& entity_pass);
 
   bool OpenPlaygroundHere(EntityPlaygroundCallback callback);
 
  private:
+  std::shared_ptr<TextRenderContext> text_render_context_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(EntityPlayground);
 };
 
diff --git a/impeller/golden_tests/golden_playground_test.h b/impeller/golden_tests/golden_playground_test.h
@@ -11,6 +11,7 @@
 #include "flutter/impeller/playground/playground.h"
 #include "flutter/impeller/renderer/render_target.h"
 #include "flutter/testing/testing.h"
+#include "impeller/typographer/text_render_context.h"
 
 #if FML_OS_MACOSX
 #include "flutter/fml/platform/darwin/scoped_nsautorelease_pool.h"
@@ -26,19 +27,20 @@ class GoldenPlaygroundTest
 
   GoldenPlaygroundTest();
 
+  ~GoldenPlaygroundTest() override;
+
   void SetUp();
 
   void TearDown();
 
   PlaygroundBackend GetBackend() const;
 
-  bool OpenPlaygroundHere(const Picture& picture,
-                          std::unique_ptr<TextRenderContext>
-                              text_render_context_override = nullptr);
+  void SetTextRenderContext(
+      std::shared_ptr<TextRenderContext> text_render_context);
+
+  bool OpenPlaygroundHere(const Picture& picture);
 
-  bool OpenPlaygroundHere(const AiksPlaygroundCallback& callback,
-                          std::unique_ptr<TextRenderContext>
-                              text_render_context_override = nullptr);
+  bool OpenPlaygroundHere(const AiksPlaygroundCallback& callback);
 
   std::shared_ptr<Texture> CreateTextureForFixture(
       const char* fixture_name,
@@ -62,6 +64,8 @@ class GoldenPlaygroundTest
   fml::ScopedNSAutoreleasePool autorelease_pool_;
 #endif
 
+  std::shared_ptr<TextRenderContext> text_render_context_;
+
   struct GoldenPlaygroundTestImpl;
   // This is only a shared_ptr so it can work with a forward declared type.
   std::shared_ptr<GoldenPlaygroundTestImpl> pimpl_;
diff --git a/impeller/golden_tests/golden_playground_test_mac.cc b/impeller/golden_tests/golden_playground_test_mac.cc
@@ -4,13 +4,15 @@
 
 #include <dlfcn.h>
 #include <filesystem>
+#include <memory>
 
 #include "flutter/impeller/golden_tests/golden_playground_test.h"
 
 #include "flutter/impeller/aiks/picture.h"
 #include "flutter/impeller/golden_tests/golden_digest.h"
 #include "flutter/impeller/golden_tests/metal_screenshoter.h"
 #include "impeller/typographer/backends/skia/text_render_context_skia.h"
+#include "impeller/typographer/text_render_context.h"
 
 namespace impeller {
 
@@ -86,7 +88,15 @@ struct GoldenPlaygroundTest::GoldenPlaygroundTestImpl {
 };
 
 GoldenPlaygroundTest::GoldenPlaygroundTest()
-    : pimpl_(new GoldenPlaygroundTest::GoldenPlaygroundTestImpl()) {}
+    : text_render_context_(TextRenderContextSkia::Make()),
+      pimpl_(new GoldenPlaygroundTest::GoldenPlaygroundTestImpl()) {}
+
+GoldenPlaygroundTest::~GoldenPlaygroundTest() = default;
+
+void GoldenPlaygroundTest::SetTextRenderContext(
+    std::shared_ptr<TextRenderContext> text_render_context) {
+  text_render_context_ = std::move(text_render_context);
+};
 
 void GoldenPlaygroundTest::TearDown() {
   ASSERT_FALSE(dlopen("/usr/local/lib/libMoltenVK.dylib", RTLD_NOLOAD));
@@ -124,22 +134,16 @@ PlaygroundBackend GoldenPlaygroundTest::GetBackend() const {
   return GetParam();
 }
 
-bool GoldenPlaygroundTest::OpenPlaygroundHere(
-    const Picture& picture,
-    std::unique_ptr<TextRenderContext> text_render_context_override) {
-  auto text_context = text_render_context_override
-                          ? std::move(text_render_context_override)
-                          : TextRenderContextSkia::Make();
-  AiksContext renderer(GetContext(), std::move(text_context));
+bool GoldenPlaygroundTest::OpenPlaygroundHere(const Picture& picture) {
+  AiksContext renderer(GetContext(), text_render_context_);
 
   auto screenshot = pimpl_->screenshoter->MakeScreenshot(renderer, picture,
                                                          pimpl_->window_size);
   return SaveScreenshot(std::move(screenshot));
 }
 
 bool GoldenPlaygroundTest::OpenPlaygroundHere(
-    const AiksPlaygroundCallback& callback,
-    std::unique_ptr<TextRenderContext> text_render_context_override) {
+    const AiksPlaygroundCallback& callback) {
   return false;
 }
 
diff --git a/impeller/golden_tests/golden_playground_test_stub.cc b/impeller/golden_tests/golden_playground_test_stub.cc
@@ -6,7 +6,14 @@
 
 namespace impeller {
 
-GoldenPlaygroundTest::GoldenPlaygroundTest() {}
+GoldenPlaygroundTest::GoldenPlaygroundTest() = default;
+
+GoldenPlaygroundTest::~GoldenPlaygroundTest() = default;
+
+void GoldenPlaygroundTest::SetTextRenderContext(
+    std::shared_ptr<TextRenderContext> text_render_context) {
+  text_render_context_ = std::move(text_render_context);
+};
 
 void GoldenPlaygroundTest::TearDown() {}
 
@@ -18,15 +25,12 @@ PlaygroundBackend GoldenPlaygroundTest::GetBackend() const {
   return GetParam();
 }
 
-bool GoldenPlaygroundTest::OpenPlaygroundHere(
-    const Picture& picture,
-    std::unique_ptr<TextRenderContext> text_render_context_override) {
+bool GoldenPlaygroundTest::OpenPlaygroundHere(const Picture& picture) {
   return false;
 }
 
 bool GoldenPlaygroundTest::OpenPlaygroundHere(
-    const AiksPlaygroundCallback& callback,
-    std::unique_ptr<TextRenderContext> text_render_context_override) {
+    const AiksPlaygroundCallback& callback) {
   return false;
 }
 
diff --git a/impeller/typographer/backends/skia/text_render_context_skia.cc b/impeller/typographer/backends/skia/text_render_context_skia.cc
@@ -28,8 +28,8 @@ using FontGlyphPairRefVector =
 //              https://github.com/flutter/flutter/issues/114563
 constexpr auto kPadding = 2;
 
-std::unique_ptr<TextRenderContext> TextRenderContextSkia::Make() {
-  return std::make_unique<TextRenderContextSkia>();
+std::shared_ptr<TextRenderContext> TextRenderContextSkia::Make() {
+  return std::make_shared<TextRenderContextSkia>();
 }
 
 TextRenderContextSkia::TextRenderContextSkia() = default;
diff --git a/impeller/typographer/backends/skia/text_render_context_skia.h b/impeller/typographer/backends/skia/text_render_context_skia.h
@@ -11,7 +11,7 @@ namespace impeller {
 
 class TextRenderContextSkia : public TextRenderContext {
  public:
-  static std::unique_ptr<TextRenderContext> Make();
+  static std::shared_ptr<TextRenderContext> Make();
 
   TextRenderContextSkia();
 
diff --git a/impeller/typographer/lazy_glyph_atlas.cc b/impeller/typographer/lazy_glyph_atlas.cc
@@ -12,7 +12,7 @@
 namespace impeller {
 
 LazyGlyphAtlas::LazyGlyphAtlas(
-    std::unique_ptr<TextRenderContext> text_render_context)
+    std::shared_ptr<TextRenderContext> text_render_context)
     : text_render_context_(std::move(text_render_context)),
       alpha_context_(std::make_shared<GlyphAtlasContext>()),
       color_context_(std::make_shared<GlyphAtlasContext>()) {}
diff --git a/impeller/typographer/lazy_glyph_atlas.h b/impeller/typographer/lazy_glyph_atlas.h
@@ -17,7 +17,7 @@ namespace impeller {
 class LazyGlyphAtlas {
  public:
   explicit LazyGlyphAtlas(
-      std::unique_ptr<TextRenderContext> text_render_context);
+      std::shared_ptr<TextRenderContext> text_render_context);
 
   ~LazyGlyphAtlas();
 
@@ -30,7 +30,7 @@ class LazyGlyphAtlas {
       GlyphAtlas::Type type) const;
 
  private:
-  std::unique_ptr<TextRenderContext> text_render_context_;
+  std::shared_ptr<TextRenderContext> text_render_context_;
 
   FontGlyphPair::Set alpha_set_;
   FontGlyphPair::Set color_set_;

Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,22 @@`
`10`	`10`
`11`	`11`	`namespace impeller {`
`12`	`12`
`13`		`-EntityPlayground::EntityPlayground() = default;`
	`13`	`+EntityPlayground::EntityPlayground()`
	`14`	`+ : text_render_context_(TextRenderContextSkia::Make()) {}`
`14`	`15`
`15`	`16`	`EntityPlayground::~EntityPlayground() = default;`
`16`	`17`
	`18`	`+void EntityPlayground::SetTextRenderContext(`
	`19`	`+ std::shared_ptr<TextRenderContext> text_render_context) {`
	`20`	`+ text_render_context_ = std::move(text_render_context);`
	`21`	`+}`
	`22`	`+`
`17`	`23`	`bool EntityPlayground::OpenPlaygroundHere(EntityPass& entity_pass) {`
`18`	`24`	`if (!switches_.enable_playground) {`
`19`	`25`	`return true;`
`20`	`26`	`}`
`21`	`27`
`22`		`- ContentContext content_context(GetContext(), TextRenderContextSkia::Make());`
	`28`	`+ ContentContext content_context(GetContext(), text_render_context_);`
`23`	`29`	`if (!content_context.IsValid()) {`
`24`	`30`	`return false;`
`25`	`31`	`}`
`@@ -35,7 +41,7 @@ bool EntityPlayground::OpenPlaygroundHere(Entity entity) {`
`35`	`41`	`return true;`
`36`	`42`	`}`
`37`	`43`
`38`		`- ContentContext content_context(GetContext(), TextRenderContextSkia::Make());`
	`44`	`+ ContentContext content_context(GetContext(), text_render_context_);`
`39`	`45`	`if (!content_context.IsValid()) {`
`40`	`46`	`return false;`
`41`	`47`	`}`
`@@ -50,7 +56,7 @@ bool EntityPlayground::OpenPlaygroundHere(EntityPlaygroundCallback callback) {`
`50`	`56`	`return true;`
`51`	`57`	`}`
`52`	`58`
`53`		`- ContentContext content_context(GetContext(), TextRenderContextSkia::Make());`
	`59`	`+ ContentContext content_context(GetContext(), text_render_context_);`
`54`	`60`	`if (!content_context.IsValid()) {`
`55`	`61`	`return false;`
`56`	`62`	`}`