Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Make dl_(image|mask|path)_(filter|effect).h tidy! #46110

Merged
matanlurey merged 1 commit into from
Sep 20, 2023
Merged

Make dl_(image|mask|path)_(filter|effect).h tidy! #46110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions display_list/effects/dl_image_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#ifndef FLUTTER_DISPLAY_LIST_EFFECTS_DL_IMAGE_FILTER_H_
#define FLUTTER_DISPLAY_LIST_EFFECTS_DL_IMAGE_FILTER_H_

#include <utility>

#include "flutter/display_list/dl_attributes.h"
#include "flutter/display_list/dl_sampling_options.h"
#include "flutter/display_list/dl_tile_mode.h"
Expand Down Expand Up @@ -223,7 +225,7 @@ class DlBlurImageFilter final : public DlImageFilter {
: DlBlurImageFilter(filter->sigma_x_,
filter->sigma_y_,
filter->tile_mode_) {}
explicit DlBlurImageFilter(const DlBlurImageFilter& filter)
DlBlurImageFilter(const DlBlurImageFilter& filter)
: DlBlurImageFilter(&filter) {}

static std::shared_ptr<DlImageFilter> Make(SkScalar sigma_x,
Expand Down Expand Up @@ -295,7 +297,7 @@ class DlDilateImageFilter final : public DlImageFilter {
: radius_x_(radius_x), radius_y_(radius_y) {}
explicit DlDilateImageFilter(const DlDilateImageFilter* filter)
: DlDilateImageFilter(filter->radius_x_, filter->radius_y_) {}
explicit DlDilateImageFilter(const DlDilateImageFilter& filter)
DlDilateImageFilter(const DlDilateImageFilter& filter)
: DlDilateImageFilter(&filter) {}

static std::shared_ptr<DlImageFilter> Make(SkScalar radius_x,
Expand Down Expand Up @@ -359,7 +361,7 @@ class DlErodeImageFilter final : public DlImageFilter {
: radius_x_(radius_x), radius_y_(radius_y) {}
explicit DlErodeImageFilter(const DlErodeImageFilter* filter)
: DlErodeImageFilter(filter->radius_x_, filter->radius_y_) {}
explicit DlErodeImageFilter(const DlErodeImageFilter& filter)
DlErodeImageFilter(const DlErodeImageFilter& filter)
: DlErodeImageFilter(&filter) {}

static std::shared_ptr<DlImageFilter> Make(SkScalar radius_x,
Expand Down Expand Up @@ -423,7 +425,7 @@ class DlMatrixImageFilter final : public DlImageFilter {
: matrix_(matrix), sampling_(sampling) {}
explicit DlMatrixImageFilter(const DlMatrixImageFilter* filter)
: DlMatrixImageFilter(filter->matrix_, filter->sampling_) {}
explicit DlMatrixImageFilter(const DlMatrixImageFilter& filter)
DlMatrixImageFilter(const DlMatrixImageFilter& filter)
: DlMatrixImageFilter(&filter) {}

static std::shared_ptr<DlImageFilter> Make(const SkMatrix& matrix,
Expand Down Expand Up @@ -510,7 +512,7 @@ class DlComposeImageFilter final : public DlImageFilter {
: DlComposeImageFilter(&outer, &inner) {}
explicit DlComposeImageFilter(const DlComposeImageFilter* filter)
: DlComposeImageFilter(filter->outer_, filter->inner_) {}
explicit DlComposeImageFilter(const DlComposeImageFilter& filter)
DlComposeImageFilter(const DlComposeImageFilter& filter)
: DlComposeImageFilter(&filter) {}

static std::shared_ptr<const DlImageFilter> Make(
Expand Down Expand Up @@ -586,7 +588,7 @@ class DlColorFilterImageFilter final : public DlImageFilter {
: color_filter_(filter.shared()) {}
explicit DlColorFilterImageFilter(const DlColorFilterImageFilter* filter)
: DlColorFilterImageFilter(filter->color_filter_) {}
explicit DlColorFilterImageFilter(const DlColorFilterImageFilter& filter)
DlColorFilterImageFilter(const DlColorFilterImageFilter& filter)
: DlColorFilterImageFilter(&filter) {}

static std::shared_ptr<DlImageFilter> Make(
Expand Down Expand Up @@ -664,7 +666,7 @@ class DlLocalMatrixImageFilter final : public DlImageFilter {
public:
explicit DlLocalMatrixImageFilter(const SkMatrix& matrix,
std::shared_ptr<DlImageFilter> filter)
: matrix_(matrix), image_filter_(filter) {}
: matrix_(matrix), image_filter_(std::move(filter)) {}
explicit DlLocalMatrixImageFilter(const DlLocalMatrixImageFilter* filter)
: DlLocalMatrixImageFilter(filter->matrix_, filter->image_filter_) {}
DlLocalMatrixImageFilter(const DlLocalMatrixImageFilter& filter)
Expand Down
2 changes: 1 addition & 1 deletion display_list/effects/dl_mask_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class DlBlurMaskFilter final : public DlMaskFilter {
: style_(style), sigma_(sigma), respect_ctm_(respect_ctm) {}
DlBlurMaskFilter(const DlBlurMaskFilter& filter)
: DlBlurMaskFilter(filter.style_, filter.sigma_, filter.respect_ctm_) {}
DlBlurMaskFilter(const DlBlurMaskFilter* filter)
explicit DlBlurMaskFilter(const DlBlurMaskFilter* filter)
: DlBlurMaskFilter(filter->style_, filter->sigma_, filter->respect_ctm_) {
}

Expand Down
2 changes: 1 addition & 1 deletion display_list/effects/dl_path_effect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class DlDashPathEffect final : public DlPathEffect {
}
}

DlDashPathEffect(const DlDashPathEffect* dash_effect)
explicit DlDashPathEffect(const DlDashPathEffect* dash_effect)
: DlDashPathEffect(dash_effect->intervals(),
dash_effect->count_,
dash_effect->phase_) {}
Expand Down