Install the skia text backend when building shell surfaces

Author: bdero

shell/common/rasterizer.h

@@ -23,6 +23,7 @@
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/fml/time/time_delta.h"
 #include "flutter/fml/time/time_point.h"
+#include "impeller/typographer/backends/skia/text_render_context_skia.h"
 #if IMPELLER_SUPPORTS_RENDERING
 // GN is having trouble understanding how this works in the Fuchsia builds.
 #include "flutter/impeller/aiks/aiks_context.h"  // nogncheck
@@ -544,7 +545,8 @@ class Rasterizer final : public SnapshotDelegate,
       return surface_->GetAiksContext();
     }
     if (auto context = impeller_context_.lock()) {
-      return std::make_shared<impeller::AiksContext>(context);
+      return std::make_shared<impeller::AiksContext>(
+          context, impeller::TextRenderContextSkia::Make());
     }
 #endif
     return nullptr;

shell/gpu/gpu_surface_gl_impeller.cc

@@ -5,9 +5,10 @@
 #include "flutter/shell/gpu/gpu_surface_gl_impeller.h"
 
 #include "flutter/fml/make_copyable.h"
-#include "flutter/impeller/display_list/dl_dispatcher.h"
-#include "flutter/impeller/renderer/backend/gles/surface_gles.h"
-#include "flutter/impeller/renderer/renderer.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/renderer/backend/gles/surface_gles.h"
+#include "impeller/renderer/renderer.h"
+#include "impeller/typographer/backends/skia/text_render_context_skia.h"
 
 namespace flutter {
 
@@ -28,7 +29,8 @@ GPUSurfaceGLImpeller::GPUSurfaceGLImpeller(
     return;
   }
 
-  auto aiks_context = std::make_shared<impeller::AiksContext>(context);
+  auto aiks_context = std::make_shared<impeller::AiksContext>(
+      context, impeller::TextRenderContextSkia::Make());
 
   if (!aiks_context->IsValid()) {
     return;

shell/gpu/gpu_surface_metal_impeller.mm

@@ -11,8 +11,9 @@
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/trace_event.h"
-#include "flutter/impeller/display_list/dl_dispatcher.h"
-#include "flutter/impeller/renderer/backend/metal/surface_mtl.h"
+#include "impeller/display_list/dl_dispatcher.h"
+#include "impeller/renderer/backend/metal/surface_mtl.h"
+#include "impeller/typographer/backends/skia/text_render_context_skia.h"
 
 static_assert(!__has_feature(objc_arc), "ARC must be disabled.");
 
@@ -35,7 +36,8 @@
       render_target_type_(delegate->GetRenderTargetType()),
       impeller_renderer_(CreateImpellerRenderer(context)),
       aiks_context_(
-          std::make_shared<impeller::AiksContext>(impeller_renderer_ ? context : nullptr)),
+          std::make_shared<impeller::AiksContext>(impeller_renderer_ ? context : nullptr,
+                                                  impeller::TextRenderContextSkia::Make())),
       render_to_surface_(render_to_surface) {
   // If this preference is explicitly set, we allow for disabling partial repaint.
   NSNumber* disablePartialRepaint =

shell/gpu/gpu_surface_vulkan_impeller.cc

@@ -5,10 +5,11 @@
 #include "flutter/shell/gpu/gpu_surface_vulkan_impeller.h"
 
 #include "flutter/fml/make_copyable.h"
-#include "flutter/impeller/display_list/dl_dispatcher.h"
-#include "flutter/impeller/renderer/renderer.h"
+#include "impeller/display_list/dl_dispatcher.h"
 #include "impeller/renderer/backend/vulkan/surface_context_vk.h"
+#include "impeller/renderer/renderer.h"
 #include "impeller/renderer/surface.h"
+#include "impeller/typographer/backends/skia/text_render_context_skia.h"
 
 namespace flutter {
 
@@ -23,7 +24,8 @@ GPUSurfaceVulkanImpeller::GPUSurfaceVulkanImpeller(
     return;
   }
 
-  auto aiks_context = std::make_shared<impeller::AiksContext>(context);
+  auto aiks_context = std::make_shared<impeller::AiksContext>(
+      context, impeller::TextRenderContextSkia::Make());
   if (!aiks_context->IsValid()) {
     return;
   }