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

Commit 62cb2c9

Browse files
flarflar
authored
[DisplayList] migrate DlColorSource objects to Impeller geometry (#56735)
The DlColorSource code uses Skia geometry classes for its internal computations. This PR switches those implementations to use the Impeller geometry classes for consistency and 3rd party header file independence.
1 parent 6b212fd commit 62cb2c9

File tree

93 files changed

+1616
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1616
-1213
lines changed

‎ci/licenses_golden/licenses_flutter

Lines changed: 66 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42532,33 +42532,50 @@ ORIGIN: ../../../flutter/display_list/dl_storage.h + ../../../flutter/LICENSE
4253242532
ORIGIN: ../../../flutter/display_list/dl_tile_mode.h + ../../../flutter/LICENSE
4253342533
ORIGIN: ../../../flutter/display_list/dl_vertices.cc + ../../../flutter/LICENSE
4253442534
ORIGIN: ../../../flutter/display_list/dl_vertices.h + ../../../flutter/LICENSE
42535-
ORIGIN: ../../../flutter/display_list/effects/dl_blur_image_filter.cc + ../../../flutter/LICENSE
42536-
ORIGIN: ../../../flutter/display_list/effects/dl_blur_image_filter.h + ../../../flutter/LICENSE
42535+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_color_color_source.cc + ../../../flutter/LICENSE
42536+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_color_color_source.h + ../../../flutter/LICENSE
42537+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_conical_gradient_color_source.cc + ../../../flutter/LICENSE
42538+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_conical_gradient_color_source.h + ../../../flutter/LICENSE
42539+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_gradient_color_source_base.h + ../../../flutter/LICENSE
42540+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_image_color_source.cc + ../../../flutter/LICENSE
42541+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_image_color_source.h + ../../../flutter/LICENSE
42542+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_linear_gradient_color_source.cc + ../../../flutter/LICENSE
42543+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_linear_gradient_color_source.h + ../../../flutter/LICENSE
42544+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_matrix_color_source_base.h + ../../../flutter/LICENSE
42545+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_radial_gradient_color_source.cc + ../../../flutter/LICENSE
42546+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_radial_gradient_color_source.h + ../../../flutter/LICENSE
42547+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_runtime_effect_color_source.cc + ../../../flutter/LICENSE
42548+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_runtime_effect_color_source.h + ../../../flutter/LICENSE
42549+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_sweep_gradient_color_source.cc + ../../../flutter/LICENSE
42550+
ORIGIN: ../../../flutter/display_list/effects/color_sources/dl_sweep_gradient_color_source.h + ../../../flutter/LICENSE
4253742551
ORIGIN: ../../../flutter/display_list/effects/dl_color_filter.cc + ../../../flutter/LICENSE
4253842552
ORIGIN: ../../../flutter/display_list/effects/dl_color_filter.h + ../../../flutter/LICENSE
42539-
ORIGIN: ../../../flutter/display_list/effects/dl_color_filter_image_filter.cc + ../../../flutter/LICENSE
42540-
ORIGIN: ../../../flutter/display_list/effects/dl_color_filter_image_filter.h + ../../../flutter/LICENSE
4254142553
ORIGIN: ../../../flutter/display_list/effects/dl_color_source.cc + ../../../flutter/LICENSE
4254242554
ORIGIN: ../../../flutter/display_list/effects/dl_color_source.h + ../../../flutter/LICENSE
42543-
ORIGIN: ../../../flutter/display_list/effects/dl_compose_image_filter.cc + ../../../flutter/LICENSE
42544-
ORIGIN: ../../../flutter/display_list/effects/dl_compose_image_filter.h + ../../../flutter/LICENSE
42545-
ORIGIN: ../../../flutter/display_list/effects/dl_dilate_image_filter.cc + ../../../flutter/LICENSE
42546-
ORIGIN: ../../../flutter/display_list/effects/dl_dilate_image_filter.h + ../../../flutter/LICENSE
42547-
ORIGIN: ../../../flutter/display_list/effects/dl_erode_image_filter.cc + ../../../flutter/LICENSE
42548-
ORIGIN: ../../../flutter/display_list/effects/dl_erode_image_filter.h + ../../../flutter/LICENSE
42555+
ORIGIN: ../../../flutter/display_list/effects/dl_color_sources.h + ../../../flutter/LICENSE
4254942556
ORIGIN: ../../../flutter/display_list/effects/dl_image_filter.cc + ../../../flutter/LICENSE
4255042557
ORIGIN: ../../../flutter/display_list/effects/dl_image_filter.h + ../../../flutter/LICENSE
4255142558
ORIGIN: ../../../flutter/display_list/effects/dl_image_filters.h + ../../../flutter/LICENSE
42552-
ORIGIN: ../../../flutter/display_list/effects/dl_local_matrix_image_filter.cc + ../../../flutter/LICENSE
42553-
ORIGIN: ../../../flutter/display_list/effects/dl_local_matrix_image_filter.h + ../../../flutter/LICENSE
4255442559
ORIGIN: ../../../flutter/display_list/effects/dl_mask_filter.cc + ../../../flutter/LICENSE
4255542560
ORIGIN: ../../../flutter/display_list/effects/dl_mask_filter.h + ../../../flutter/LICENSE
42556-
ORIGIN: ../../../flutter/display_list/effects/dl_matrix_image_filter.cc + ../../../flutter/LICENSE
42557-
ORIGIN: ../../../flutter/display_list/effects/dl_matrix_image_filter.h + ../../../flutter/LICENSE
4255842561
ORIGIN: ../../../flutter/display_list/effects/dl_runtime_effect.cc + ../../../flutter/LICENSE
4255942562
ORIGIN: ../../../flutter/display_list/effects/dl_runtime_effect.h + ../../../flutter/LICENSE
42560-
ORIGIN: ../../../flutter/display_list/effects/dl_runtime_effect_image_filter.cc + ../../../flutter/LICENSE
42561-
ORIGIN: ../../../flutter/display_list/effects/dl_runtime_effect_image_filter.h + ../../../flutter/LICENSE
42563+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_blur_image_filter.cc + ../../../flutter/LICENSE
42564+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_blur_image_filter.h + ../../../flutter/LICENSE
42565+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_color_filter_image_filter.cc + ../../../flutter/LICENSE
42566+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_color_filter_image_filter.h + ../../../flutter/LICENSE
42567+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_compose_image_filter.cc + ../../../flutter/LICENSE
42568+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_compose_image_filter.h + ../../../flutter/LICENSE
42569+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_dilate_image_filter.cc + ../../../flutter/LICENSE
42570+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_dilate_image_filter.h + ../../../flutter/LICENSE
42571+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_erode_image_filter.cc + ../../../flutter/LICENSE
42572+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_erode_image_filter.h + ../../../flutter/LICENSE
42573+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_local_matrix_image_filter.cc + ../../../flutter/LICENSE
42574+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_local_matrix_image_filter.h + ../../../flutter/LICENSE
42575+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_matrix_image_filter.cc + ../../../flutter/LICENSE
42576+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_matrix_image_filter.h + ../../../flutter/LICENSE
42577+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_runtime_effect_image_filter.cc + ../../../flutter/LICENSE
42578+
ORIGIN: ../../../flutter/display_list/effects/image_filters/dl_runtime_effect_image_filter.h + ../../../flutter/LICENSE
4256242579
ORIGIN: ../../../flutter/display_list/geometry/dl_geometry_types.h + ../../../flutter/LICENSE
4256342580
ORIGIN: ../../../flutter/display_list/geometry/dl_path.cc + ../../../flutter/LICENSE
4256442581
ORIGIN: ../../../flutter/display_list/geometry/dl_path.h + ../../../flutter/LICENSE
@@ -45432,33 +45449,50 @@ FILE: ../../../flutter/display_list/dl_storage.h
4543245449
FILE: ../../../flutter/display_list/dl_tile_mode.h
4543345450
FILE: ../../../flutter/display_list/dl_vertices.cc
4543445451
FILE: ../../../flutter/display_list/dl_vertices.h
45435-
FILE: ../../../flutter/display_list/effects/dl_blur_image_filter.cc
45436-
FILE: ../../../flutter/display_list/effects/dl_blur_image_filter.h
45452+
FILE: ../../../flutter/display_list/effects/color_sources/dl_color_color_source.cc
45453+
FILE: ../../../flutter/display_list/effects/color_sources/dl_color_color_source.h
45454+
FILE: ../../../flutter/display_list/effects/color_sources/dl_conical_gradient_color_source.cc
45455+
FILE: ../../../flutter/display_list/effects/color_sources/dl_conical_gradient_color_source.h
45456+
FILE: ../../../flutter/display_list/effects/color_sources/dl_gradient_color_source_base.h
45457+
FILE: ../../../flutter/display_list/effects/color_sources/dl_image_color_source.cc
45458+
FILE: ../../../flutter/display_list/effects/color_sources/dl_image_color_source.h
45459+
FILE: ../../../flutter/display_list/effects/color_sources/dl_linear_gradient_color_source.cc
45460+
FILE: ../../../flutter/display_list/effects/color_sources/dl_linear_gradient_color_source.h
45461+
FILE: ../../../flutter/display_list/effects/color_sources/dl_matrix_color_source_base.h
45462+
FILE: ../../../flutter/display_list/effects/color_sources/dl_radial_gradient_color_source.cc
45463+
FILE: ../../../flutter/display_list/effects/color_sources/dl_radial_gradient_color_source.h
45464+
FILE: ../../../flutter/display_list/effects/color_sources/dl_runtime_effect_color_source.cc
45465+
FILE: ../../../flutter/display_list/effects/color_sources/dl_runtime_effect_color_source.h
45466+
FILE: ../../../flutter/display_list/effects/color_sources/dl_sweep_gradient_color_source.cc
45467+
FILE: ../../../flutter/display_list/effects/color_sources/dl_sweep_gradient_color_source.h
4543745468
FILE: ../../../flutter/display_list/effects/dl_color_filter.cc
4543845469
FILE: ../../../flutter/display_list/effects/dl_color_filter.h
45439-
FILE: ../../../flutter/display_list/effects/dl_color_filter_image_filter.cc
45440-
FILE: ../../../flutter/display_list/effects/dl_color_filter_image_filter.h
4544145470
FILE: ../../../flutter/display_list/effects/dl_color_source.cc
4544245471
FILE: ../../../flutter/display_list/effects/dl_color_source.h
45443-
FILE: ../../../flutter/display_list/effects/dl_compose_image_filter.cc
45444-
FILE: ../../../flutter/display_list/effects/dl_compose_image_filter.h
45445-
FILE: ../../../flutter/display_list/effects/dl_dilate_image_filter.cc
45446-
FILE: ../../../flutter/display_list/effects/dl_dilate_image_filter.h
45447-
FILE: ../../../flutter/display_list/effects/dl_erode_image_filter.cc
45448-
FILE: ../../../flutter/display_list/effects/dl_erode_image_filter.h
45472+
FILE: ../../../flutter/display_list/effects/dl_color_sources.h
4544945473
FILE: ../../../flutter/display_list/effects/dl_image_filter.cc
4545045474
FILE: ../../../flutter/display_list/effects/dl_image_filter.h
4545145475
FILE: ../../../flutter/display_list/effects/dl_image_filters.h
45452-
FILE: ../../../flutter/display_list/effects/dl_local_matrix_image_filter.cc
45453-
FILE: ../../../flutter/display_list/effects/dl_local_matrix_image_filter.h
4545445476
FILE: ../../../flutter/display_list/effects/dl_mask_filter.cc
4545545477
FILE: ../../../flutter/display_list/effects/dl_mask_filter.h
45456-
FILE: ../../../flutter/display_list/effects/dl_matrix_image_filter.cc
45457-
FILE: ../../../flutter/display_list/effects/dl_matrix_image_filter.h
4545845478
FILE: ../../../flutter/display_list/effects/dl_runtime_effect.cc
4545945479
FILE: ../../../flutter/display_list/effects/dl_runtime_effect.h
45460-
FILE: ../../../flutter/display_list/effects/dl_runtime_effect_image_filter.cc
45461-
FILE: ../../../flutter/display_list/effects/dl_runtime_effect_image_filter.h
45480+
FILE: ../../../flutter/display_list/effects/image_filters/dl_blur_image_filter.cc
45481+
FILE: ../../../flutter/display_list/effects/image_filters/dl_blur_image_filter.h
45482+
FILE: ../../../flutter/display_list/effects/image_filters/dl_color_filter_image_filter.cc
45483+
FILE: ../../../flutter/display_list/effects/image_filters/dl_color_filter_image_filter.h
45484+
FILE: ../../../flutter/display_list/effects/image_filters/dl_compose_image_filter.cc
45485+
FILE: ../../../flutter/display_list/effects/image_filters/dl_compose_image_filter.h
45486+
FILE: ../../../flutter/display_list/effects/image_filters/dl_dilate_image_filter.cc
45487+
FILE: ../../../flutter/display_list/effects/image_filters/dl_dilate_image_filter.h
45488+
FILE: ../../../flutter/display_list/effects/image_filters/dl_erode_image_filter.cc
45489+
FILE: ../../../flutter/display_list/effects/image_filters/dl_erode_image_filter.h
45490+
FILE: ../../../flutter/display_list/effects/image_filters/dl_local_matrix_image_filter.cc
45491+
FILE: ../../../flutter/display_list/effects/image_filters/dl_local_matrix_image_filter.h
45492+
FILE: ../../../flutter/display_list/effects/image_filters/dl_matrix_image_filter.cc
45493+
FILE: ../../../flutter/display_list/effects/image_filters/dl_matrix_image_filter.h
45494+
FILE: ../../../flutter/display_list/effects/image_filters/dl_runtime_effect_image_filter.cc
45495+
FILE: ../../../flutter/display_list/effects/image_filters/dl_runtime_effect_image_filter.h
4546245496
FILE: ../../../flutter/display_list/geometry/dl_geometry_types.h
4546345497
FILE: ../../../flutter/display_list/geometry/dl_path.cc
4546445498
FILE: ../../../flutter/display_list/geometry/dl_path.h

‎display_list/BUILD.gn

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,47 @@ source_set("display_list") {
4747
"dl_tile_mode.h",
4848
"dl_vertices.cc",
4949
"dl_vertices.h",
50-
"effects/dl_blur_image_filter.cc",
51-
"effects/dl_blur_image_filter.h",
50+
"effects/color_sources/dl_color_color_source.cc",
51+
"effects/color_sources/dl_color_color_source.h",
52+
"effects/color_sources/dl_conical_gradient_color_source.cc",
53+
"effects/color_sources/dl_conical_gradient_color_source.h",
54+
"effects/color_sources/dl_image_color_source.cc",
55+
"effects/color_sources/dl_image_color_source.h",
56+
"effects/color_sources/dl_linear_gradient_color_source.cc",
57+
"effects/color_sources/dl_linear_gradient_color_source.h",
58+
"effects/color_sources/dl_radial_gradient_color_source.cc",
59+
"effects/color_sources/dl_radial_gradient_color_source.h",
60+
"effects/color_sources/dl_runtime_effect_color_source.cc",
61+
"effects/color_sources/dl_runtime_effect_color_source.h",
62+
"effects/color_sources/dl_sweep_gradient_color_source.cc",
63+
"effects/color_sources/dl_sweep_gradient_color_source.h",
5264
"effects/dl_color_filter.cc",
5365
"effects/dl_color_filter.h",
54-
"effects/dl_color_filter_image_filter.cc",
55-
"effects/dl_color_filter_image_filter.h",
5666
"effects/dl_color_source.cc",
5767
"effects/dl_color_source.h",
58-
"effects/dl_compose_image_filter.cc",
59-
"effects/dl_compose_image_filter.h",
60-
"effects/dl_dilate_image_filter.cc",
61-
"effects/dl_dilate_image_filter.h",
62-
"effects/dl_erode_image_filter.cc",
63-
"effects/dl_erode_image_filter.h",
6468
"effects/dl_image_filter.cc",
6569
"effects/dl_image_filter.h",
6670
"effects/dl_image_filters.h",
67-
"effects/dl_local_matrix_image_filter.cc",
68-
"effects/dl_local_matrix_image_filter.h",
6971
"effects/dl_mask_filter.cc",
7072
"effects/dl_mask_filter.h",
71-
"effects/dl_matrix_image_filter.cc",
72-
"effects/dl_matrix_image_filter.h",
7373
"effects/dl_runtime_effect.cc",
7474
"effects/dl_runtime_effect.h",
75-
"effects/dl_runtime_effect_image_filter.cc",
76-
"effects/dl_runtime_effect_image_filter.h",
75+
"effects/image_filters/dl_blur_image_filter.cc",
76+
"effects/image_filters/dl_blur_image_filter.h",
77+
"effects/image_filters/dl_color_filter_image_filter.cc",
78+
"effects/image_filters/dl_color_filter_image_filter.h",
79+
"effects/image_filters/dl_compose_image_filter.cc",
80+
"effects/image_filters/dl_compose_image_filter.h",
81+
"effects/image_filters/dl_dilate_image_filter.cc",
82+
"effects/image_filters/dl_dilate_image_filter.h",
83+
"effects/image_filters/dl_erode_image_filter.cc",
84+
"effects/image_filters/dl_erode_image_filter.h",
85+
"effects/image_filters/dl_local_matrix_image_filter.cc",
86+
"effects/image_filters/dl_local_matrix_image_filter.h",
87+
"effects/image_filters/dl_matrix_image_filter.cc",
88+
"effects/image_filters/dl_matrix_image_filter.h",
89+
"effects/image_filters/dl_runtime_effect_image_filter.cc",
90+
"effects/image_filters/dl_runtime_effect_image_filter.h",
7791
"geometry/dl_geometry_types.h",
7892
"geometry/dl_path.cc",
7993
"geometry/dl_path.h",

0 commit comments

Comments
 (0)