diff --git a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc index 5e72c04994bbac2e0839cbaa52c82de010a49289..fbc6c340d32f869de9ae33c9b686af807b945240 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc @@ -49,7 +49,7 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition( for (size_t i = 0; i < layers_count; ++i) { const auto* layer = layers[i]; - sk_sp platform_renderered_contents; + sk_sp platform_rendered_contents; sk_sp layer_image; SkIPoint canvas_offset = SkIPoint::Make(0, 0); diff --git a/shell/platform/embedder/tests/embedder_test_compositor_software.cc b/shell/platform/embedder/tests/embedder_test_compositor_software.cc index 9c8a5e567686505c84aefcc975a827d600916b6c..ce7cc1c2113369217ba4481909f0ea6834535054 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_software.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_software.cc @@ -40,7 +40,7 @@ bool EmbedderTestCompositorSoftware::UpdateOffscrenComposition( for (size_t i = 0; i < layers_count; ++i) { const auto* layer = layers[i]; - sk_sp platform_renderered_contents; + sk_sp platform_rendered_contents; sk_sp layer_image; SkIPoint canvas_offset = SkIPoint::Make(0, 0); diff --git a/shell/platform/embedder/tests/embedder_unittests.cc b/shell/platform/embedder/tests/embedder_unittests.cc index 2fe1cb19122d922b4f081c80c9b6c6f0fc9550a3..469b20bcea0b9df27a17f11fefc631dc531cb11a 100644 --- a/shell/platform/embedder/tests/embedder_unittests.cc +++ b/shell/platform/embedder/tests/embedder_unittests.cc @@ -948,7 +948,7 @@ TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) { kSuccess); ASSERT_TRUE(engine.is_valid()); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); latch.Wait(); @@ -957,8 +957,8 @@ TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) { #if !defined(OS_LINUX) GTEST_SKIP() << "Skipping golden tests on non-Linux OSes"; #endif // OS_LINUX - ASSERT_TRUE(ImageMatchesFixture("verifyb143464703_soft_noxform.png", - renderered_scene)); + ASSERT_TRUE( + ImageMatchesFixture("verifyb143464703_soft_noxform.png", rendered_scene)); } TEST_F(EmbedderTest, CanSendLowMemoryNotification) { diff --git a/shell/platform/embedder/tests/embedder_unittests_gl.cc b/shell/platform/embedder/tests/embedder_unittests_gl.cc index a7fc2e93160f3c935cc1cfa05b7f2234c2478c86..80c7d9c0cbc7c77579e2e1cc8fa3465af5501895 100644 --- a/shell/platform/embedder/tests/embedder_unittests_gl.cc +++ b/shell/platform/embedder/tests/embedder_unittests_gl.cc @@ -1171,7 +1171,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositor) { builder.SetDartEntrypoint("can_render_scene_without_custom_compositor"); builder.SetOpenGLRendererConfig(SkISize::Make(800, 600)); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1186,7 +1186,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositor) { kSuccess); ASSERT_TRUE(ImageMatchesFixture("scene_without_custom_compositor.png", - renderered_scene)); + rendered_scene)); } TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorWithTransformation) { @@ -1202,7 +1202,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorWithTransformation) { builder.SetDartEntrypoint("can_render_scene_without_custom_compositor"); builder.SetOpenGLRendererConfig(SkISize::Make(600, 800)); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1219,7 +1219,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorWithTransformation) { kSuccess); ASSERT_TRUE(ImageMatchesFixture( - "scene_without_custom_compositor_with_xform.png", renderered_scene)); + "scene_without_custom_compositor_with_xform.png", rendered_scene)); } TEST_F(EmbedderTest, CanRenderGradientWithoutCompositor) { @@ -1230,7 +1230,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositor) { builder.SetDartEntrypoint("render_gradient"); builder.SetOpenGLRendererConfig(SkISize::Make(800, 600)); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1244,7 +1244,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositor) { ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess); - ASSERT_TRUE(ImageMatchesFixture("gradient.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("gradient.png", rendered_scene)); } TEST_F(EmbedderTest, CanRenderGradientWithoutCompositorWithXform) { @@ -1262,7 +1262,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositorWithXform) { builder.SetDartEntrypoint("render_gradient"); builder.SetOpenGLRendererConfig(surface_size); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1277,7 +1277,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositorWithXform) { ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess); - ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", rendered_scene)); } TEST_F(EmbedderTest, CanRenderGradientWithCompositor) { @@ -1291,7 +1291,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositor) { builder.SetRenderTargetType( EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1305,7 +1305,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositor) { ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess); - ASSERT_TRUE(ImageMatchesFixture("gradient.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("gradient.png", rendered_scene)); } TEST_F(EmbedderTest, CanRenderGradientWithCompositorWithXform) { @@ -1327,7 +1327,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorWithXform) { builder.SetRenderTargetType( EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1342,7 +1342,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorWithXform) { ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess); - ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", rendered_scene)); } TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayer) { @@ -1433,7 +1433,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayer) { return surface->makeImageSnapshot(); }); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1447,7 +1447,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayer) { ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess); - ASSERT_TRUE(ImageMatchesFixture("gradient.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("gradient.png", rendered_scene)); } TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) { @@ -1546,7 +1546,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) { return surface->makeImageSnapshot(); }); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -1561,7 +1561,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) { ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event), kSuccess); - ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", rendered_scene)); } TEST_F(EmbedderTest, VerifyB141980393) { @@ -1811,7 +1811,7 @@ TEST_F(EmbedderTest, fml::CountDownLatch latch(1); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); context.GetCompositor().SetNextPresentCallback( [&](const FlutterLayer** layers, size_t layers_count) { @@ -1884,7 +1884,7 @@ TEST_F(EmbedderTest, latch.Wait(); - ASSERT_TRUE(ImageMatchesFixture("dpr_noxform.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("dpr_noxform.png", rendered_scene)); } TEST_F( @@ -1905,7 +1905,7 @@ TEST_F( context.SetRootSurfaceTransformation(root_surface_transformation); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); fml::CountDownLatch latch(1); context.GetCompositor().SetNextPresentCallback( @@ -1979,7 +1979,7 @@ TEST_F( latch.Wait(); - ASSERT_TRUE(ImageMatchesFixture("dpr_xform.png", renderered_scene)); + ASSERT_TRUE(ImageMatchesFixture("dpr_xform.png", rendered_scene)); } TEST_F(EmbedderTest, diff --git a/shell/platform/embedder/tests/embedder_unittests_metal.cc b/shell/platform/embedder/tests/embedder_unittests_metal.cc index 6a75a38f37f70f56583c2d455697a70d7f33e355..a52822c86f284c024a410c1c85c963936e307ccc 100644 --- a/shell/platform/embedder/tests/embedder_unittests_metal.cc +++ b/shell/platform/embedder/tests/embedder_unittests_metal.cc @@ -29,7 +29,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithMetal) { builder.SetDartEntrypoint("render_gradient"); builder.SetMetalRendererConfig(SkISize::Make(800, 600)); - auto renderered_scene = context.GetNextSceneImage(); + auto rendered_scene = context.GetNextSceneImage(); auto engine = builder.LaunchEngine(); ASSERT_TRUE(engine.is_valid()); @@ -45,7 +45,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithMetal) { // TODO (https://github.com/flutter/flutter/issues/73590): re-enable once // we are able to figure out why this fails on the bots. - // ASSERT_TRUE(ImageMatchesFixture("gradient_metal.png", renderered_scene)); + // ASSERT_TRUE(ImageMatchesFixture("gradient_metal.png", rendered_scene)); } } // namespace testing