removed creator and toRendererColorFilter method

Author: alanwutang11

lib/web_ui/lib/src/engine/canvaskit/canvas.dart

@@ -9,6 +9,7 @@ import 'package:ui/ui.dart' as ui;
 
 import '../color_filter.dart';
 import 'canvaskit_api.dart';
+import 'color_filter.dart';
 import 'image.dart';
 import 'image_filter.dart';
 import 'painting.dart';
@@ -293,7 +294,7 @@ class CkCanvas {
       [CkPaint? paint]) {
         final CkManagedSkImageFilterConvertible convertible;
         if (filter is ui.ColorFilter) {
-          convertible = (filter as EngineColorFilter).toRendererColorFilter() as CkManagedSkImageFilterConvertible;
+          convertible = createCkColorFilter(filter as EngineColorFilter)!;
         }
         else {
           convertible = filter as CkManagedSkImageFilterConvertible;
@@ -1169,8 +1170,13 @@ class CkSaveLayerWithFilterCommand extends CkPaintCommand {
 
   @override
   void apply(SkCanvas canvas) {
-    final CkManagedSkImageFilterConvertible convertible =
-        filter as CkManagedSkImageFilterConvertible;
+    final CkManagedSkImageFilterConvertible convertible;
+        if (filter is ui.ColorFilter) {
+          convertible = createCkColorFilter(filter as EngineColorFilter)!;
+        }
+        else {
+          convertible = filter as CkManagedSkImageFilterConvertible;
+        }
     return canvas.saveLayer(
       paint?.skiaObject,
       toSkRect(bounds),

lib/web_ui/lib/src/engine/canvaskit/color_filter.dart

@@ -6,6 +6,7 @@ import 'dart:typed_data';
 
 import 'package:ui/ui.dart' as ui;
 
+import '../color_filter.dart';
 import '../util.dart';
 import 'canvaskit_api.dart';
 import 'image_filter.dart';
@@ -56,7 +57,7 @@ class ManagedSkColorFilter extends ManagedSkiaObject<SkColorFilter> {
 /// [ManagedSkiaObject] that manages a skia image filter.
 abstract class CkColorFilter
     implements CkManagedSkImageFilterConvertible {
-  const CkColorFilter(this.creator);
+  const CkColorFilter();
 
   /// Called by [ManagedSkiaObject.createDefault] and
   /// [ManagedSkiaObject.resurrect] to create a new [SkImageFilter], when this
@@ -72,14 +73,10 @@ abstract class CkColorFilter
   @override
   ManagedSkiaObject<SkImageFilter> get imageFilter =>
       CkColorFilterImageFilter(colorFilter: this);
-
-  /// Convert the CkColorFilter back into a ui.ColorFilter.
-  /// Used in [CkPaint].
-  final ui.ColorFilter creator;
 }
 
 class CkBlendModeColorFilter extends CkColorFilter {
-  const CkBlendModeColorFilter(super.creator, this.color, this.blendMode);
+  const CkBlendModeColorFilter(this.color, this.blendMode);
 
   final ui.Color color;
   final ui.BlendMode blendMode;
@@ -132,7 +129,7 @@ class CkBlendModeColorFilter extends CkColorFilter {
 }
 
 class CkMatrixColorFilter extends CkColorFilter {
-  const CkMatrixColorFilter(super.creator, this.matrix);
+  const CkMatrixColorFilter(this.matrix);
 
   final List<double> matrix;
 
@@ -175,7 +172,7 @@ class CkMatrixColorFilter extends CkColorFilter {
 }
 
 class CkLinearToSrgbGammaColorFilter extends CkColorFilter {
-  const CkLinearToSrgbGammaColorFilter(super.creator);
+  const CkLinearToSrgbGammaColorFilter();
   @override
   SkColorFilter _initRawColorFilter() =>
       canvasKit.ColorFilter.MakeLinearToSRGBGamma();
@@ -191,7 +188,7 @@ class CkLinearToSrgbGammaColorFilter extends CkColorFilter {
 }
 
 class CkSrgbToLinearGammaColorFilter extends CkColorFilter {
-  const CkSrgbToLinearGammaColorFilter(super.creator);
+  const CkSrgbToLinearGammaColorFilter();
   @override
   SkColorFilter _initRawColorFilter() =>
       canvasKit.ColorFilter.MakeSRGBToLinearGamma();
@@ -207,7 +204,7 @@ class CkSrgbToLinearGammaColorFilter extends CkColorFilter {
 }
 
 class CkComposeColorFilter extends CkColorFilter {
-  const CkComposeColorFilter(super.creator, this.outer, this.inner);
+  const CkComposeColorFilter(this.outer, this.inner);
   final ManagedSkColorFilter? outer;
   final ManagedSkColorFilter inner;
 
@@ -230,3 +227,30 @@ class CkComposeColorFilter extends CkColorFilter {
   @override
   String toString() => 'ColorFilter.compose($outer, $inner)';
 }
+
+/// Convert the current [ColorFilter] to a CkColorFilter.
+///
+/// This workaround allows ColorFilter to be const constructbile and
+/// efficiently comparable, so that widgets can check for ColorFilter equality to
+/// avoid repainting.
+CkColorFilter? createCkColorFilter(EngineColorFilter colorFilter) {
+  switch (colorFilter.type) {
+      case ColorFilterType.mode:
+        if (colorFilter.color == null || colorFilter.blendMode == null) {
+          return null;
+        }
+        return CkBlendModeColorFilter(colorFilter.color!, colorFilter.blendMode!);
+      case ColorFilterType.matrix:
+        if (colorFilter.matrix == null) {
+          return null;
+        }
+        assert(colorFilter.matrix!.length == 20, 'Color Matrix must have 20 entries.');
+        return CkMatrixColorFilter(colorFilter.matrix!);
+      case ColorFilterType.linearToSrgbGamma:
+        return const CkLinearToSrgbGammaColorFilter();
+      case ColorFilterType.srgbToLinearGamma:
+        return const CkSrgbToLinearGammaColorFilter();
+      default:
+        throw StateError('Unknown mode $colorFilter.type for ColorFilter.');
+    }
+}

lib/web_ui/lib/src/engine/canvaskit/painting.dart

@@ -132,11 +132,7 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
         _effectiveColorFilter = _invertColorFilter;
       } else {
         _effectiveColorFilter = ManagedSkColorFilter(
-          CkComposeColorFilter(
-            _effectiveColorFilter!.colorFilter.creator,
-            _invertColorFilter,
-            _effectiveColorFilter!
-            )
+          CkComposeColorFilter(_invertColorFilter, _effectiveColorFilter!)
         );
       }
     }
@@ -207,22 +203,22 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
   }
 
   ui.FilterQuality _filterQuality = ui.FilterQuality.none;
+  EngineColorFilter? _engineColorFilter;
 
   @override
-  ui.ColorFilter? get colorFilter {
-    return _effectiveColorFilter?.colorFilter.creator;
-  }
+  ui.ColorFilter? get colorFilter => _engineColorFilter;
+
   @override
   set colorFilter(ui.ColorFilter? value) {
-    if (colorFilter == value) {
+    if (_engineColorFilter == value) {
       return;
     }
-
+    _engineColorFilter = value as EngineColorFilter?;
     _originalColorFilter = null;
     if (value == null) {
       _effectiveColorFilter = null;
     } else {
-      final CkColorFilter ckColorFilter = (value as EngineColorFilter).toRendererColorFilter() as CkColorFilter;
+      final CkColorFilter ckColorFilter = createCkColorFilter(value)!;
       _effectiveColorFilter = ManagedSkColorFilter(ckColorFilter);
     }
 
@@ -232,11 +228,7 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
         _effectiveColorFilter = _invertColorFilter;
       } else {
         _effectiveColorFilter = ManagedSkColorFilter(
-          CkComposeColorFilter(
-            _effectiveColorFilter!.colorFilter.creator,
-            _invertColorFilter,
-            _effectiveColorFilter!
-          )
+          CkComposeColorFilter(_invertColorFilter, _effectiveColorFilter!)
         );
       }
     }
@@ -270,7 +262,7 @@ class CkPaint extends ManagedSkiaObject<SkPaint> implements ui.Paint {
       return;
     }
     if (value is ui.ColorFilter) {
-      _imageFilter = (value as EngineColorFilter).toRendererColorFilter() as CkManagedSkImageFilterConvertible?;
+      _imageFilter = createCkColorFilter(value as EngineColorFilter);
     }
     else {
       _imageFilter = value as CkManagedSkImageFilterConvertible?;
@@ -323,12 +315,7 @@ final Float32List _invertColorMatrix = Float32List.fromList(const <double>[
   1.0, 1.0, 1.0, 1.0, 0
 ]);
 
-final ManagedSkColorFilter _invertColorFilter = createInvertedColorFilter(_invertColorMatrix);
-
-ManagedSkColorFilter createInvertedColorFilter(Float32List invertColorMatrix) {
-  final ui.ColorFilter creator = ui.ColorFilter.matrix(invertColorMatrix);
-  return ManagedSkColorFilter(CkMatrixColorFilter(creator, invertColorMatrix));
-}
+final ManagedSkColorFilter _invertColorFilter = ManagedSkColorFilter(CkMatrixColorFilter(_invertColorMatrix));
 
 class UniformData {
   const UniformData({

lib/web_ui/lib/src/engine/canvaskit/renderer.dart

@@ -16,7 +16,6 @@ import '../profiler.dart';
 import '../renderer.dart';
 import 'canvaskit_api.dart';
 import 'canvaskit_canvas.dart';
-import 'color_filter.dart';
 import 'fonts.dart';
 import 'image.dart';
 import 'image_filter.dart';
@@ -195,27 +194,6 @@ class CanvasKitRenderer implements Renderer {
     throw UnimplementedError('ImageFilter.compose not implemented for CanvasKit.');
   }
 
-  @override
-  CkMatrixColorFilter createMatrixColorFilter(
-    ui.ColorFilter creator,
-    List<double> matrix
-  ) => CkMatrixColorFilter(creator, matrix);
-
-  @override
-  CkBlendModeColorFilter createModeColorFilter(
-    ui.ColorFilter creator,
-    ui.Color color,
-    ui.BlendMode blendMode
-  ) => CkBlendModeColorFilter(creator, color, blendMode);
-
-  @override
-  CkLinearToSrgbGammaColorFilter createLinearToSrgbGammaColorFilter(ui.ColorFilter creator) =>
-    CkLinearToSrgbGammaColorFilter(creator);
-
-  @override
-  CkSrgbToLinearGammaColorFilter createSrgbToLinearGammaColorFilter(ui.ColorFilter creator) =>
-    CkSrgbToLinearGammaColorFilter(creator);
-
   @override
   Future<ui.Codec> instantiateImageCodec(
     Uint8List list, {

lib/web_ui/lib/src/engine/color_filter.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:ui/src/engine/renderer.dart';
 import 'package:ui/ui.dart' as ui;
 
 enum ColorFilterType {
@@ -28,11 +27,9 @@ class EngineColorFilter implements ui.ColorFilter {
   /// The output of this filter is then composited into the background according
   /// to the [Paint.blendMode], using the output of this filter as the source
   /// and the background as the destination.
-  const EngineColorFilter.mode(ui.Color color, ui.BlendMode blendMode)
-    : _color = color,
-      _blendMode = blendMode,
-      _matrix = null,
-      _type = ColorFilterType.mode;
+  const EngineColorFilter.mode(ui.Color this.color, ui.BlendMode this.blendMode)
+    : matrix = null,
+      type = ColorFilterType.mode;
 
   /// Construct a color filter that transforms a color by a 5x5 matrix, where
   /// the fifth row is implicitly added in an identity configuration.
@@ -94,70 +91,29 @@ class EngineColorFilter implements ui.ColorFilter {
   ///   0,      0,      0,      1, 0,
   /// ]);
   /// ```
-  const EngineColorFilter.matrix(List<double> matrix)
-      : _color = null,
-        _blendMode = null,
-        _matrix = matrix,
-        _type = ColorFilterType.matrix;
+  const EngineColorFilter.matrix(List<double> this.matrix)
+      : color = null,
+        blendMode = null,
+        type = ColorFilterType.matrix;
 
   /// Construct a color filter that applies the sRGB gamma curve to the RGB
   /// channels.
   const EngineColorFilter.linearToSrgbGamma()
-      : _color = null,
-        _blendMode = null,
-        _matrix = null,
-        _type = ColorFilterType.linearToSrgbGamma;
+      : color = null,
+        blendMode = null,
+        matrix = null,
+        type = ColorFilterType.linearToSrgbGamma;
 
   /// Creates a color filter that applies the inverse of the sRGB gamma curve
   /// to the RGB channels.
   const EngineColorFilter.srgbToLinearGamma()
-      : _color = null,
-        _blendMode = null,
-        _matrix = null,
-        _type = ColorFilterType.srgbToLinearGamma;
+      : color = null,
+        blendMode = null,
+        matrix = null,
+        type = ColorFilterType.srgbToLinearGamma;
 
-  final ui.Color? _color;
-  final ui.BlendMode? _blendMode;
-  final List<double>? _matrix;
-  final ColorFilterType _type;
-
-  /// Convert the current [ColorFilter] to either a [CkColorFilter] or [HtmlEngineColorFilter]
-  /// depending on the renderer.
-  ///
-  /// After calling this function and getting the renderer specific ColorFilter,
-  /// cast the correct type on the converted ColorFilter based on the renderer backend:
-  ///
-  /// canvaskit: [CkColorFilter]
-  /// Html: [HtmlEngineColorFilter]
-  ///
-  /// ## Example uses:
-  /// ```
-  /// CkColorFilter ckColorFilter =
-  ///   (ColorFilter.mode(Color color, BlendMode blendMode) as EngineColorFilter).toRendererColorFilter() as CkColorFilter;
-  /// ```
-  ///
-  /// This workaround allows ColorFilter to be const constructbile and
-  /// efficiently comparable, so that widgets can check for ColorFilter equality to
-  /// avoid repainting.
-  dynamic toRendererColorFilter() {
-    switch (_type) {
-      case ColorFilterType.mode:
-        if (_color == null || _blendMode == null) {
-          return null;
-        }
-        return renderer.createModeColorFilter(this, _color!, _blendMode!);
-      case ColorFilterType.matrix:
-        if (_matrix == null) {
-          return null;
-        }
-        assert(_matrix!.length == 20, 'Color Matrix must have 20 entries.');
-        return renderer.createMatrixColorFilter(this, _matrix!);
-      case ColorFilterType.linearToSrgbGamma:
-        return renderer.createLinearToSrgbGammaColorFilter(this);
-      case ColorFilterType.srgbToLinearGamma:
-        return renderer.createSrgbToLinearGammaColorFilter(this);
-      default:
-        throw StateError('Unknown mode $_type for ColorFilter.');
-    }
-  }
+  final ui.Color? color;
+  final ui.BlendMode? blendMode;
+  final List<double>? matrix;
+  final ColorFilterType type;
 }

lib/web_ui/lib/src/engine/html/backdrop_filter.dart

@@ -77,7 +77,7 @@ class PersistedBackdropFilter extends PersistedContainerSurface
   void apply() {
     EngineImageFilter backendFilter;
     if (filter is ui.ColorFilter) {
-      backendFilter = (filter as EngineColorFilter).toRendererColorFilter() as EngineHtmlColorFilter;
+      backendFilter = createHtmlColorFilter(filter as EngineColorFilter)!;
     } else {
       backendFilter = filter as EngineImageFilter;
     }
@@ -135,7 +135,7 @@ class PersistedBackdropFilter extends PersistedContainerSurface
         /// Some blendModes do not make an svgFilter. See [EngineHtmlColorFilter.makeSvgFilter()]
         if (_svgFilter == null) {
             return;
-        }
+      }
       } else if (backendFilter is MatrixHtmlColorFilter) {
         _svgFilter = backendFilter.makeSvgFilter(_filterElement);
       }

lib/web_ui/lib/src/engine/html/bitmap_canvas.dart

@@ -646,7 +646,7 @@ class BitmapCanvas extends EngineCanvas {
       ui.Image image, ui.Offset p, SurfacePaintData paint) {
     final HtmlImage htmlImage = image as HtmlImage;
     final ui.BlendMode? blendMode = paint.blendMode;
-    final EngineHtmlColorFilter? colorFilter = paint.colorFilter;
+    final EngineHtmlColorFilter? colorFilter = createHtmlColorFilter(paint.colorFilter);
     DomHTMLElement imgElement;
     if (colorFilter is ModeHtmlColorFilter) {
       imgElement = _createImageElementWithBlend(

lib/web_ui/lib/src/engine/html/color_filter.dart

@@ -73,8 +73,7 @@ class PersistedColorFilter extends PersistedContainerSurface
   void apply() {
     flutterViewEmbedder.removeResource(_filterElement);
     _filterElement = null;
-    final EngineHtmlColorFilter? engineValue =
-    (filter as EngineColorFilter).toRendererColorFilter() as EngineHtmlColorFilter?;
+    final EngineHtmlColorFilter? engineValue = createHtmlColorFilter(filter as EngineColorFilter);
     if (engineValue == null) {
       rootElement!.style.backgroundColor = '';
       childContainer?.style.visibility = 'visible';