diff --git a/engine/src/flutter/lib/ui/painting.dart b/engine/src/flutter/lib/ui/painting.dart index 0b7c330f114..ea1233e441a 100644 --- a/engine/src/flutter/lib/ui/painting.dart +++ b/engine/src/flutter/lib/ui/painting.dart @@ -3531,9 +3531,9 @@ class _ImageFilter extends NativeFieldWrapperClass1 { creator = filter { // ignore: prefer_initializing_formals _constructor(); final _ColorFilter? nativeFilter = filter._toNativeColorFilter(); - _initColorFilter(nativeFilter); + _initColorFilter(nativeFilter!); } - void _initColorFilter(_ColorFilter? colorFilter) native 'ImageFilter_initColorFilter'; + void _initColorFilter(_ColorFilter colorFilter) native 'ImageFilter_initColorFilter'; /// Composes `_innerFilter` with `_outerFilter`. _ImageFilter.composed(_ComposeImageFilter filter) diff --git a/engine/src/flutter/lib/ui/painting/image_filter.cc b/engine/src/flutter/lib/ui/painting/image_filter.cc index 0fb65b8bc8b..dd4c5c35dee 100644 --- a/engine/src/flutter/lib/ui/painting/image_filter.cc +++ b/engine/src/flutter/lib/ui/painting/image_filter.cc @@ -92,14 +92,15 @@ void ImageFilter::initMatrix(const tonic::Float64List& matrix4, } void ImageFilter::initColorFilter(ColorFilter* colorFilter) { - filter_ = std::make_shared( - colorFilter ? colorFilter->dl_filter() : nullptr); + FML_DCHECK(colorFilter); + filter_ = + std::make_shared(colorFilter->dl_filter()); } void ImageFilter::initComposeFilter(ImageFilter* outer, ImageFilter* inner) { - filter_ = std::make_shared( - outer ? outer->dl_filter() : nullptr, - inner ? inner->dl_filter() : nullptr); + FML_DCHECK(outer && inner); + filter_ = std::make_shared(outer->dl_filter(), + inner->dl_filter()); } } // namespace flutter