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

Commit 0436bee

Browse files
flarflar
committed
restructure DL sources into sub-dirs and new file naming
1 parent a927d27 commit 0436bee

152 files changed

Lines changed: 827 additions & 803 deletions

File tree

Some content is hidden

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

‎ci/licenses_golden/excluded_files‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929
../../../flutter/build
3030
../../../flutter/ci
3131
../../../flutter/common/README.md
32-
../../../flutter/display_list/display_list_color_filter_unittests.cc
33-
../../../flutter/display_list/display_list_color_source_unittests.cc
34-
../../../flutter/display_list/display_list_color_unittests.cc
35-
../../../flutter/display_list/display_list_complexity_unittests.cc
36-
../../../flutter/display_list/display_list_image_filter_unittests.cc
37-
../../../flutter/display_list/display_list_mask_filter_unittests.cc
38-
../../../flutter/display_list/display_list_matrix_clip_tracker_unittests.cc
39-
../../../flutter/display_list/display_list_paint_unittests.cc
40-
../../../flutter/display_list/display_list_path_effect_unittests.cc
41-
../../../flutter/display_list/display_list_rtree_unittests.cc
32+
../../../flutter/display_list/benchmarking/dl_complexity_unittests.cc
4233
../../../flutter/display_list/display_list_unittests.cc
43-
../../../flutter/display_list/display_list_vertices_unittests.cc
44-
../../../flutter/display_list/dl_rendering_unittests.cc
34+
../../../flutter/display_list/dl_color_unittests.cc
35+
../../../flutter/display_list/dl_paint_unittests.cc
36+
../../../flutter/display_list/effects/dl_color_filter_unittests.cc
37+
../../../flutter/display_list/effects/dl_color_source_unittests.cc
38+
../../../flutter/display_list/effects/dl_image_filter_unittests.cc
39+
../../../flutter/display_list/effects/dl_mask_filter_unittests.cc
40+
../../../flutter/display_list/effects/dl_path_effect_unittests.cc
41+
../../../flutter/display_list/dl_vertices_unittests.cc
42+
../../../flutter/display_list/geometry/dl_rtree_unittests.cc
4543
../../../flutter/display_list/skia/dl_sk_conversions_unittests.cc
46-
../../../flutter/display_list/skia/dl_sk_utils_unittests.cc
44+
../../../flutter/display_list/skia/dl_sk_paint_dispatcher_unittests.cc
45+
../../../flutter/display_list/testing/dl_rendering_unittests.cc
4746
../../../flutter/display_list/testing
47+
../../../flutter/display_list/utils/dl_matrix_clip_tracker_unittests.cc
4848
../../../flutter/docs
4949
../../../flutter/examples
5050
../../../flutter/flow/README.md

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 108 additions & 104 deletions
Large diffs are not rendered by default.

‎display_list/BUILD.gn‎

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -9,65 +9,67 @@ import("//flutter/testing/testing.gni")
99

1010
source_set("display_list") {
1111
sources = [
12+
"benchmarking/dl_complexity.cc",
13+
"benchmarking/dl_complexity.h",
14+
"benchmarking/dl_complexity_gl.cc",
15+
"benchmarking/dl_complexity_gl.h",
16+
"benchmarking/dl_complexity_metal.cc",
17+
"benchmarking/dl_complexity_metal.h",
1218
"display_list.cc",
1319
"display_list.h",
14-
"display_list_attributes.h",
15-
"display_list_blend_mode.cc",
16-
"display_list_blend_mode.h",
17-
"display_list_builder.cc",
18-
"display_list_builder.h",
19-
"display_list_color.h",
20-
"display_list_color_filter.cc",
21-
"display_list_color_filter.h",
22-
"display_list_color_source.cc",
23-
"display_list_color_source.h",
24-
"display_list_complexity.cc",
25-
"display_list_complexity.h",
26-
"display_list_complexity_gl.cc",
27-
"display_list_complexity_gl.h",
28-
"display_list_complexity_metal.cc",
29-
"display_list_complexity_metal.h",
30-
"display_list_flags.cc",
31-
"display_list_flags.h",
32-
"display_list_image.cc",
33-
"display_list_image.h",
34-
"display_list_image_filter.cc",
35-
"display_list_image_filter.h",
36-
"display_list_image_skia.cc",
37-
"display_list_image_skia.h",
38-
"display_list_mask_filter.cc",
39-
"display_list_mask_filter.h",
40-
"display_list_matrix_clip_tracker.cc",
41-
"display_list_matrix_clip_tracker.h",
42-
"display_list_ops.cc",
43-
"display_list_ops.h",
44-
"display_list_paint.cc",
45-
"display_list_paint.h",
46-
"display_list_path_effect.cc",
47-
"display_list_path_effect.h",
48-
"display_list_rtree.cc",
49-
"display_list_rtree.h",
50-
"display_list_runtime_effect.cc",
51-
"display_list_runtime_effect.h",
52-
"display_list_sampling_options.h",
53-
"display_list_tile_mode.h",
54-
"display_list_utils.cc",
55-
"display_list_utils.h",
56-
"display_list_vertices.cc",
57-
"display_list_vertices.h",
20+
"dl_attributes.h",
21+
"dl_blend_mode.cc",
22+
"dl_blend_mode.h",
23+
"dl_builder.cc",
24+
"dl_builder.h",
5825
"dl_canvas.cc",
5926
"dl_canvas.h",
27+
"dl_color.h",
28+
"dl_op_flags.cc",
29+
"dl_op_flags.h",
6030
"dl_op_receiver.cc",
6131
"dl_op_receiver.h",
32+
"dl_op_records.cc",
33+
"dl_op_records.h",
34+
"dl_paint.cc",
35+
"dl_paint.h",
36+
"dl_sampling_options.h",
37+
"dl_tile_mode.h",
38+
"dl_vertices.cc",
39+
"dl_vertices.h",
40+
"effects/dl_color_filter.cc",
41+
"effects/dl_color_filter.h",
42+
"effects/dl_color_source.cc",
43+
"effects/dl_color_source.h",
44+
"effects/dl_image_filter.cc",
45+
"effects/dl_image_filter.h",
46+
"effects/dl_mask_filter.cc",
47+
"effects/dl_mask_filter.h",
48+
"effects/dl_path_effect.cc",
49+
"effects/dl_path_effect.h",
50+
"effects/dl_runtime_effect.cc",
51+
"effects/dl_runtime_effect.h",
52+
"geometry/dl_rtree.cc",
53+
"geometry/dl_rtree.h",
54+
"image/dl_image.cc",
55+
"image/dl_image.h",
56+
"image/dl_image_skia.cc",
57+
"image/dl_image_skia.h",
6258
"skia/dl_sk_canvas.cc",
6359
"skia/dl_sk_canvas.h",
6460
"skia/dl_sk_conversions.cc",
6561
"skia/dl_sk_conversions.h",
6662
"skia/dl_sk_dispatcher.cc",
6763
"skia/dl_sk_dispatcher.h",
68-
"skia/dl_sk_utils.cc",
69-
"skia/dl_sk_utils.h",
70-
"types.h",
64+
"skia/dl_sk_paint_dispatcher.cc",
65+
"skia/dl_sk_paint_dispatcher.h",
66+
"skia/dl_sk_types.h",
67+
"utils/dl_bounds_accumulator.cc",
68+
"utils/dl_bounds_accumulator.h",
69+
"utils/dl_matrix_clip_tracker.cc",
70+
"utils/dl_matrix_clip_tracker.h",
71+
"utils/dl_receiver_utils.cc",
72+
"utils/dl_receiver_utils.h",
7173
]
7274

7375
public_deps = [
@@ -94,20 +96,20 @@ if (enable_unittests) {
9496
testonly = true
9597

9698
sources = [
97-
"display_list_color_filter_unittests.cc",
98-
"display_list_color_source_unittests.cc",
99-
"display_list_color_unittests.cc",
100-
"display_list_complexity_unittests.cc",
101-
"display_list_image_filter_unittests.cc",
102-
"display_list_mask_filter_unittests.cc",
103-
"display_list_matrix_clip_tracker_unittests.cc",
104-
"display_list_paint_unittests.cc",
105-
"display_list_path_effect_unittests.cc",
106-
"display_list_rtree_unittests.cc",
99+
"benchmarking/dl_complexity_unittests.cc",
107100
"display_list_unittests.cc",
108-
"display_list_vertices_unittests.cc",
101+
"dl_color_unittests.cc",
102+
"dl_paint_unittests.cc",
103+
"dl_vertices_unittests.cc",
104+
"effects/dl_color_filter_unittests.cc",
105+
"effects/dl_color_source_unittests.cc",
106+
"effects/dl_image_filter_unittests.cc",
107+
"effects/dl_mask_filter_unittests.cc",
108+
"effects/dl_path_effect_unittests.cc",
109+
"geometry/dl_rtree_unittests.cc",
109110
"skia/dl_sk_conversions_unittests.cc",
110-
"skia/dl_sk_utils_unittests.cc",
111+
"skia/dl_sk_paint_dispatcher_unittests.cc",
112+
"utils/dl_matrix_clip_tracker_unittests.cc",
111113
]
112114

113115
deps = [
@@ -135,7 +137,7 @@ if (enable_unittests) {
135137
executable("display_list_rendertests") {
136138
testonly = true
137139

138-
sources = [ "dl_rendering_unittests.cc" ]
140+
sources = [ "testing/dl_rendering_unittests.cc" ]
139141

140142
deps = [
141143
":display_list",
@@ -163,7 +165,7 @@ if (enable_unittests) {
163165
executable("display_list_builder_benchmarks") {
164166
testonly = true
165167

166-
sources = [ "display_list_builder_benchmarks.cc" ]
168+
sources = [ "benchmarking/dl_builder_benchmarks.cc" ]
167169

168170
deps = [
169171
":display_list",
@@ -183,8 +185,8 @@ source_set("display_list_benchmarks_source") {
183185
testonly = true
184186

185187
sources = [
186-
"display_list_benchmarks.cc",
187-
"display_list_benchmarks.h",
188+
"benchmarking/dl_benchmarks.cc",
189+
"benchmarking/dl_benchmarks.h",
188190
]
189191

190192
deps = [

display_list/display_list_benchmarks.cc renamed to display_list/benchmarking/dl_benchmarks.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/display_list/display_list_benchmarks.h"
6-
#include "flutter/display_list/display_list_builder.h"
7-
#include "flutter/display_list/display_list_flags.h"
5+
#include "flutter/display_list/benchmarking/dl_benchmarks.h"
6+
#include "flutter/display_list/dl_builder.h"
7+
#include "flutter/display_list/dl_op_flags.h"
88
#include "flutter/display_list/skia/dl_sk_canvas.h"
99

10+
#include "third_party/skia/include/core/SkBitmap.h"
1011
#include "third_party/skia/include/core/SkPoint.h"
1112
#include "third_party/skia/include/core/SkSurface.h"
1213
#include "third_party/skia/include/core/SkTextBlob.h"

display_list/display_list_benchmarks.h renamed to display_list/benchmarking/dl_benchmarks.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
6-
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
5+
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
6+
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
77

8-
#include "flutter/display_list/display_list_sampling_options.h"
9-
#include "flutter/display_list/display_list_vertices.h"
108
#include "flutter/display_list/dl_canvas.h"
9+
#include "flutter/display_list/dl_sampling_options.h"
10+
#include "flutter/display_list/dl_vertices.h"
1111
#include "flutter/display_list/testing/dl_test_surface_provider.h"
1212

1313
#include "third_party/benchmark/include/benchmark/benchmark.h"
@@ -587,4 +587,4 @@ void BM_SaveLayer(benchmark::State& state,
587587
} // namespace testing
588588
} // namespace flutter
589589

590-
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
590+
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_

display_list/display_list_builder_benchmarks.cc renamed to display_list/benchmarking/dl_builder_benchmarks.cc

File renamed without changes.

display_list/display_list_complexity.cc renamed to display_list/benchmarking/dl_complexity.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/display_list/display_list_complexity.h"
5+
#include "flutter/display_list/benchmarking/dl_complexity.h"
6+
#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
7+
#include "flutter/display_list/benchmarking/dl_complexity_metal.h"
68
#include "flutter/display_list/display_list.h"
7-
#include "flutter/display_list/display_list_complexity_gl.h"
8-
#include "flutter/display_list/display_list_complexity_metal.h"
99

1010
namespace flutter {
1111

display_list/display_list_complexity.h renamed to display_list/benchmarking/dl_complexity.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
6-
#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
5+
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
6+
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
77

88
#include "flutter/display_list/display_list.h"
9-
#include "flutter/display_list/types.h"
9+
1010
#include "third_party/skia/include/gpu/GrTypes.h"
1111

1212
namespace flutter {
@@ -55,4 +55,4 @@ class DisplayListNaiveComplexityCalculator
5555

5656
} // namespace flutter
5757

58-
#endif // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
58+
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_

display_list/display_list_complexity_gl.cc renamed to display_list/benchmarking/dl_complexity_gl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "flutter/display_list/display_list_complexity_gl.h"
5+
#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
66

77
// The numbers and weightings used in this file stem from taking the
88
// data from the DisplayListBenchmarks suite run on an Pixel 4 and

display_list/display_list_complexity_gl.h renamed to display_list/benchmarking/dl_complexity_gl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
6-
#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
5+
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
6+
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
77

8-
#include "flutter/display_list/display_list_complexity_helper.h"
8+
#include "flutter/display_list/benchmarking/dl_complexity_helper.h"
99

1010
namespace flutter {
1111

@@ -98,4 +98,4 @@ class DisplayListGLComplexityCalculator
9898

9999
} // namespace flutter
100100

101-
#endif // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
101+
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_

0 commit comments

Comments
 (0)