Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
../../../flutter/impeller/core/allocator_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_atlas_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_basic_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_blend_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_clip_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_gradient_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_opacity_unittests.cc
Expand Down
6 changes: 3 additions & 3 deletions display_list/effects/dl_image_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ class DlColorFilterImageFilter final : public DlImageFilter {
class DlLocalMatrixImageFilter final : public DlImageFilter {
public:
explicit DlLocalMatrixImageFilter(const SkMatrix& matrix,
std::shared_ptr<DlImageFilter> filter)
std::shared_ptr<const DlImageFilter> filter)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this change I can't pass a composed image filter here

: matrix_(matrix), image_filter_(std::move(filter)) {}
explicit DlLocalMatrixImageFilter(const DlLocalMatrixImageFilter* filter)
: DlLocalMatrixImageFilter(filter->matrix_, filter->image_filter_) {}
Expand All @@ -682,7 +682,7 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {

const SkMatrix& matrix() const { return matrix_; }

const std::shared_ptr<DlImageFilter> image_filter() const {
const std::shared_ptr<const DlImageFilter> image_filter() const {
return image_filter_;
}

Expand Down Expand Up @@ -738,7 +738,7 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {

private:
SkMatrix matrix_;
std::shared_ptr<DlImageFilter> image_filter_;
std::shared_ptr<const DlImageFilter> image_filter_;
};

} // namespace flutter
Expand Down
Loading