++

shell/gpu/gpu_surface_metal_impeller_unittests.mm

@@ -66,15 +66,16 @@ GPUCAMetalLayerHandle GetCAMetalLayer(const SkISize& frame_info) const override
 
 TEST(GPUSurfaceMetalImpeller, CanCreateValidSurface) {
   auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
-  auto surface = std::make_shared<GPUSurfaceMetalImpeller>(delegate.get(), CreateImpellerContext());
+  auto surface = std::make_shared<GPUSurfaceMetalImpeller>(
+      delegate.get(), std::make_shared<impeller::AiksContext>(CreateImpellerContext(), nullptr));
 
   ASSERT_TRUE(surface->IsValid());
 }
 
 TEST(GPUSurfaceMetalImpeller, AcquireFrameFromCAMetalLayerNullChecksDrawable) {
   auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
-  std::shared_ptr<Surface> surface =
-      std::make_shared<GPUSurfaceMetalImpeller>(delegate.get(), CreateImpellerContext());
+  std::shared_ptr<Surface> surface = std::make_shared<GPUSurfaceMetalImpeller>(
+      delegate.get(), std::make_shared<impeller::AiksContext>(CreateImpellerContext(), nullptr));
 
   ASSERT_TRUE(surface->IsValid());
 
@@ -85,8 +86,8 @@ GPUCAMetalLayerHandle GetCAMetalLayer(const SkISize& frame_info) const override
 TEST(GPUSurfaceMetalImpeller, AcquireFrameFromCAMetalLayerDoesNotRetainThis) {
   auto delegate = std::make_shared<TestGPUSurfaceMetalDelegate>();
   delegate->SetDevice();
-  std::unique_ptr<Surface> surface =
-      std::make_unique<GPUSurfaceMetalImpeller>(delegate.get(), CreateImpellerContext());
+  std::unique_ptr<Surface> surface = std::make_unique<GPUSurfaceMetalImpeller>(
+      delegate.get(), std::make_shared<impeller::AiksContext>(CreateImpellerContext(), nullptr));
 
   ASSERT_TRUE(surface->IsValid());
 
@@ -105,8 +106,7 @@ GPUCAMetalLayerHandle GetCAMetalLayer(const SkISize& frame_info) const override
 
   auto context = CreateImpellerContext();
   std::unique_ptr<Surface> surface = std::make_unique<GPUSurfaceMetalImpeller>(
-      delegate.get(),
-      std::make_shared<impeller::AiksContext>(context, impeller::TypographerContextSkia::Make()));
+      delegate.get(), std::make_shared<impeller::AiksContext>(context, nullptr));
 
   ASSERT_TRUE(surface->IsValid());
 
@@ -133,8 +133,7 @@ GPUCAMetalLayerHandle GetCAMetalLayer(const SkISize& frame_info) const override
   delegate->SetDevice();
 
   auto context = CreateImpellerContext();
-  auto aiks_context =
-      std::make_shared<impeller::AiksContext>(context, impeller::TypographerContextSkia::Make());
+  auto aiks_context = std::make_shared<impeller::AiksContext>(context, nullptr);
 
   EXPECT_FALSE(context->GetCaptureManager()->CaptureScopeActive());