test fixes

Author: flar

impeller/display_list/dl_golden_unittests.cc

@@ -195,7 +195,8 @@ TEST_P(DlGoldenTest, FastVsGeneralGaussianMaskBlur) {
       DlColor::kMaroon(),
   };
 
-  auto make_rrect_path = [](const SkRect& rect, DlScalar rx, DlScalar ry) {
+  auto make_rrect_path = [](const SkRect& rect, DlScalar rx,
+                            DlScalar ry) -> SkPath {
     auto add_corner = [](SkPath& path, SkPoint rCorner, SkPoint rEnd) {
       static const auto magic = impeller::PathBuilder::kArcApproximationMagic;
       path.rCubicTo(rCorner.fX * (1.0f - magic), rCorner.fY * (1.0f - magic),

impeller/display_list/skia_conversions_unittests.cc

@@ -180,8 +180,33 @@ TEST(SkiaConversionsTest, IsNearlySimpleRRect) {
       SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 10)));
   EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(
       SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 9.999)));
-  EXPECT_FALSE(skia_conversions::IsNearlySimpleRRect(
+  EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(
       SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 9)));
+  EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(
+      SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 5)));
+  SkRect rect = SkRect::MakeLTRB(0, 0, 10, 10);
+  SkRRect rrect;
+  union {
+    SkPoint radii[4] = {
+        {10.0f, 9.0f},
+        {10.0f, 9.0f},
+        {10.0f, 9.0f},
+        {10.0f, 9.0f},
+    };
+    SkScalar values[8];
+  } test;
+  rrect.setRectRadii(rect, test.radii);
+  EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(rrect));
+  for (int i = 0; i < 8; i++) {
+    auto save = test.values[i];
+    test.values[i] -= kEhCloseEnough * 0.5f;
+    rrect.setRectRadii(rect, test.radii);
+    EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(rrect));
+    test.values[i] -= kEhCloseEnough * 2.0f;
+    rrect.setRectRadii(rect, test.radii);
+    EXPECT_FALSE(skia_conversions::IsNearlySimpleRRect(rrect));
+    test.values[i] = save;
+  }
 }
 
 }  // namespace testing

testing/impeller_golden_tests_output.txt

@@ -855,6 +855,9 @@ impeller_Play_DlGoldenTest_CanRenderImage_Vulkan.png
 impeller_Play_DlGoldenTest_DashedLinesTest_Metal.png
 impeller_Play_DlGoldenTest_DashedLinesTest_OpenGLES.png
 impeller_Play_DlGoldenTest_DashedLinesTest_Vulkan.png
+impeller_Play_DlGoldenTest_FastVsGeneralGaussianMaskBlur_Metal.png
+impeller_Play_DlGoldenTest_FastVsGeneralGaussianMaskBlur_OpenGLES.png
+impeller_Play_DlGoldenTest_FastVsGeneralGaussianMaskBlur_Vulkan.png
 impeller_Play_DlGoldenTest_GaussianVsRRectBlurScaledRotated_Metal.png
 impeller_Play_DlGoldenTest_GaussianVsRRectBlurScaledRotated_OpenGLES.png
 impeller_Play_DlGoldenTest_GaussianVsRRectBlurScaledRotated_Vulkan.png