asserted and fixed blur styles

Author: gaaclarke

impeller/display_list/aiks_dl_blur_unittests.cc

@@ -61,7 +61,8 @@ TEST_P(AiksTest, SolidColorOvalsMaskBlurTinySigma) {
 }
 
 sk_sp<flutter::DisplayList> DoGradientOvalStrokeMaskBlur(Vector2 content_Scale,
-                                                         Scalar sigma) {
+                                                         Scalar sigma,
+                                                         DlBlurStyle style) {
   DisplayListBuilder builder;
   builder.Scale(content_Scale.x, content_Scale.y);
 
@@ -73,7 +74,7 @@ sk_sp<flutter::DisplayList> DoGradientOvalStrokeMaskBlur(Vector2 content_Scale,
   std::vector<Scalar> stops = {0.0, 1.0};
 
   DlPaint paint;
-  paint.setMaskFilter(DlBlurMaskFilter::Make(DlBlurStyle::kNormal, sigma));
+  paint.setMaskFilter(DlBlurMaskFilter::Make(style, sigma));
   auto gradient = DlColorSource::MakeLinear(
       {0, 0}, {200, 200}, 2, colors.data(), stops.data(), DlTileMode::kClamp);
   paint.setColorSource(gradient);
@@ -99,14 +100,30 @@ sk_sp<flutter::DisplayList> DoGradientOvalStrokeMaskBlur(Vector2 content_Scale,
   return builder.Build();
 }
 
+// https://github.com/flutter/flutter/issues/155930
+TEST_P(AiksTest, GradientOvalStrokeMaskBlur) {
+  ASSERT_TRUE(OpenPlaygroundHere(DoGradientOvalStrokeMaskBlur(
+      GetContentScale(), /*sigma=*/10, DlBlurStyle::kNormal)));
+}
+
 TEST_P(AiksTest, GradientOvalStrokeMaskBlurSigmaZero) {
-  ASSERT_TRUE(OpenPlaygroundHere(
-      DoGradientOvalStrokeMaskBlur(GetContentScale(), /*sigma=*/0)));
+  ASSERT_TRUE(OpenPlaygroundHere(DoGradientOvalStrokeMaskBlur(
+      GetContentScale(), /*sigma=*/0, DlBlurStyle::kNormal)));
 }
 
-TEST_P(AiksTest, GradientOvalStrokeMaskBlur) {
-  ASSERT_TRUE(OpenPlaygroundHere(
-      DoGradientOvalStrokeMaskBlur(GetContentScale(), /*sigma=*/10)));
+TEST_P(AiksTest, GradientOvalStrokeMaskBlurOuter) {
+  ASSERT_TRUE(OpenPlaygroundHere(DoGradientOvalStrokeMaskBlur(
+      GetContentScale(), /*sigma=*/10, DlBlurStyle::kOuter)));
+}
+
+TEST_P(AiksTest, GradientOvalStrokeMaskBlurInner) {
+  ASSERT_TRUE(OpenPlaygroundHere(DoGradientOvalStrokeMaskBlur(
+      GetContentScale(), /*sigma=*/10, DlBlurStyle::kInner)));
+}
+
+TEST_P(AiksTest, GradientOvalStrokeMaskBlurSolid) {
+  ASSERT_TRUE(OpenPlaygroundHere(DoGradientOvalStrokeMaskBlur(
+      GetContentScale(), /*sigma=*/10, DlBlurStyle::kSolid)));
 }
 
 TEST_P(AiksTest, SolidColorCircleMaskBlurTinySigma) {

impeller/entity/contents/filters/gaussian_blur_filter_contents.cc

@@ -551,7 +551,8 @@ Entity ApplyBlurStyle(FilterContents::BlurStyle blur_style,
                       const Snapshot& input_snapshot,
                       Entity blur_entity,
                       const Geometry* geometry,
-                      Vector2 source_space_scalar) {
+                      Vector2 source_space_scalar,
+                      Vector2 source_space_offset) {
   switch (blur_style) {
     case FilterContents::BlurStyle::kNormal:
       return blur_entity;
@@ -569,9 +570,11 @@ Entity ApplyBlurStyle(FilterContents::BlurStyle blur_style,
           Entity::FromSnapshot(input_snapshot, entity.GetBlendMode());
       Entity result;
       Matrix blurred_transform = blur_entity.GetTransform();
-      Matrix snapshot_transform = entity.GetTransform() *  //
-                                  Matrix::MakeScale(1.f / source_space_scalar) *
-                                  input_snapshot.transform;
+      Matrix snapshot_transform =
+          entity.GetTransform() *  //
+          Matrix::MakeScale(1.f / source_space_scalar) *
+          Matrix::MakeTranslation(-1 * source_space_offset) *
+          input_snapshot.transform;
       result.SetContents(Contents::MakeAnonymous(
           fml::MakeCopyable([blur_entity = blur_entity.Clone(),
                              blurred_transform, snapshot_transform,
@@ -845,7 +848,8 @@ std::optional<Entity> GaussianBlurFilterContents::RenderFilter(
 
   return ApplyBlurStyle(mask_blur_style_, entity, inputs[0],
                         input_snapshot.value(), std::move(blur_output_entity),
-                        mask_geometry_, blur_info.source_space_scalar);
+                        mask_geometry_, blur_info.source_space_scalar,
+                        blur_info.source_space_offset);
 }
 
 Scalar GaussianBlurFilterContents::CalculateBlurRadius(Scalar sigma) {