From 5bba744365e1515606c6dd2eed23b753dfdf452a Mon Sep 17 00:00:00 2001
From: "auto-submit[bot]" <flutter-engprod-team@google.com>
Date: Thu, 4 Jul 2024 07:02:59 +0000
Subject: [PATCH] Revert "fix: mask disappeared when having nested mask filter
 on Flutter web HTML (#45166)"

This reverts commit c90aa9a512c8b4d2f33ca3a981ed3acc4ebc6c5d.
---
 lib/web_ui/lib/src/engine/canvas_pool.dart    | 28 ++++++++--------
 .../canvas_mask_filter_golden_test.dart       | 32 -------------------
 2 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/lib/web_ui/lib/src/engine/canvas_pool.dart b/lib/web_ui/lib/src/engine/canvas_pool.dart
index 4fbc1eecf21f5..2fb4ad478b16c 100644
--- a/lib/web_ui/lib/src/engine/canvas_pool.dart
+++ b/lib/web_ui/lib/src/engine/canvas_pool.dart
@@ -934,7 +934,6 @@ class ContextStateHandle {
   }
 
   ui.MaskFilter? _currentFilter;
-  String? _currentFilterCss;
   SurfacePaintData? _lastUsedPaint;
 
   /// Currently active shader bounds.
@@ -1004,20 +1003,19 @@ class ContextStateHandle {
     }
 
     final ui.MaskFilter? maskFilter = paint.maskFilter;
-    if (maskFilter != null) {
-      if (!_renderMaskFilterForWebkit) {
-        if (_currentFilter != maskFilter) {
-          _currentFilter = maskFilter;
-          _currentFilterCss = maskFilterToCanvasFilter(maskFilter);
-        }
-        context.filter = _currentFilterCss;
-      } else {
-        // WebKit does not support the `filter` property. Instead we apply a
-        // shadow to the shape of the same color as the paint and the same blur
-        // as the mask filter.
-        //
-        // Note that on WebKit the cached value of _currentFilter is not useful.
-        // Instead we destructure it into the shadow properties and cache those.
+    if (!_renderMaskFilterForWebkit) {
+      if (_currentFilter != maskFilter) {
+        _currentFilter = maskFilter;
+        context.filter = maskFilterToCanvasFilter(maskFilter);
+      }
+    } else {
+      // WebKit does not support the `filter` property. Instead we apply a
+      // shadow to the shape of the same color as the paint and the same blur
+      // as the mask filter.
+      //
+      // Note that on WebKit the cached value of _currentFilter is not useful.
+      // Instead we destructure it into the shadow properties and cache those.
+      if (maskFilter != null) {
         context.save();
         context.shadowBlur = convertSigmaToRadius(maskFilter.webOnlySigma);
         // Shadow color must be fully opaque.
diff --git a/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart b/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart
index e38aa59726892..840bb0c23332d 100644
--- a/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart
+++ b/lib/web_ui/test/html/compositing/canvas_mask_filter_golden_test.dart
@@ -150,38 +150,6 @@ Future<void> testMain() async {
       await canvasScreenshot(rc, 'mask_filter_transformed_$browser',
           region: screenRect);
     });
-
-    test('multiple MaskFilter.blur in $browser', () async {
-      const double screenWidth = 300.0;
-      const double screenHeight = 300.0;
-      const ui.Rect screenRect =
-          ui.Rect.fromLTWH(0, 0, screenWidth, screenHeight);
-
-      ContextStateHandle.debugEmulateWebKitMaskFilter = isWebkit;
-      final RecordingCanvas rc = RecordingCanvas(screenRect);
-
-      final SurfacePaint paint = SurfacePaint()
-        ..maskFilter = const ui.MaskFilter.blur(ui.BlurStyle.normal, 5);
-      rc.save();
-      rc.drawCircle(const ui.Offset(150, 150), 100,
-          paint..color = const ui.Color(0xFFC8C800));
-      rc.restore();
-      rc.save();
-      rc.drawCircle(const ui.Offset(150, 150), 50,
-          paint..color = const ui.Color(0xFFC800C8));
-      rc.restore();
-      rc.save();
-      rc.drawCircle(
-          const ui.Offset(150, 150),
-          20,
-          paint
-            ..color = const ui.Color(0xFF00C8C8)
-            ..maskFilter = const ui.MaskFilter.blur(ui.BlurStyle.normal, 10));
-      rc.restore();
-
-      await canvasScreenshot(rc, 'multiple_mask_filter_$browser',
-          region: screenRect);
-    });
   }
 
   testMaskFilterBlur();