Skip to content

Commit

Permalink
restructure DL sources into sub-directories and new file naming conve…
Browse files Browse the repository at this point in the history 
…ntions (flutter#40157)

restructure DL sources into sub-directories and new file naming conventions
  • Loading branch information
@flar
flar authored Mar 21, 2023
1 parent ea39822 commit ee6969d
Show file tree
Hide file tree
Showing 153 changed files with 822 additions and 801 deletions.
25 changes: 12 additions & 13 deletions ci/licenses_golden/excluded_files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,21 @@
../../../flutter/build
../../../flutter/ci
../../../flutter/common/README.md
../../../flutter/display_list/display_list_color_filter_unittests.cc
../../../flutter/display_list/display_list_color_source_unittests.cc
../../../flutter/display_list/display_list_color_unittests.cc
../../../flutter/display_list/display_list_complexity_unittests.cc
../../../flutter/display_list/display_list_image_filter_unittests.cc
../../../flutter/display_list/display_list_mask_filter_unittests.cc
../../../flutter/display_list/display_list_matrix_clip_tracker_unittests.cc
../../../flutter/display_list/display_list_paint_unittests.cc
../../../flutter/display_list/display_list_path_effect_unittests.cc
../../../flutter/display_list/display_list_rtree_unittests.cc
../../../flutter/display_list/benchmarking/dl_complexity_unittests.cc
../../../flutter/display_list/display_list_unittests.cc
../../../flutter/display_list/display_list_vertices_unittests.cc
../../../flutter/display_list/dl_rendering_unittests.cc
../../../flutter/display_list/dl_color_unittests.cc
../../../flutter/display_list/dl_paint_unittests.cc
../../../flutter/display_list/dl_vertices_unittests.cc
../../../flutter/display_list/effects/dl_color_filter_unittests.cc
../../../flutter/display_list/effects/dl_color_source_unittests.cc
../../../flutter/display_list/effects/dl_image_filter_unittests.cc
../../../flutter/display_list/effects/dl_mask_filter_unittests.cc
../../../flutter/display_list/effects/dl_path_effect_unittests.cc
../../../flutter/display_list/geometry/dl_rtree_unittests.cc
../../../flutter/display_list/skia/dl_sk_conversions_unittests.cc
../../../flutter/display_list/skia/dl_sk_utils_unittests.cc
../../../flutter/display_list/skia/dl_sk_paint_dispatcher_unittests.cc
../../../flutter/display_list/testing
../../../flutter/display_list/utils/dl_matrix_clip_tracker_unittests.cc
../../../flutter/docs
../../../flutter/examples
../../../flutter/flow/README.md
Expand Down
212 changes: 108 additions & 104 deletions ci/licenses_golden/licenses_flutter
View file

Large diffs are not rendered by default.

128 changes: 65 additions & 63 deletions display_list/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,65 +17,67 @@ config("display_list_config") {

source_set("display_list") {
sources = [
"benchmarking/dl_complexity.cc",
"benchmarking/dl_complexity.h",
"benchmarking/dl_complexity_gl.cc",
"benchmarking/dl_complexity_gl.h",
"benchmarking/dl_complexity_metal.cc",
"benchmarking/dl_complexity_metal.h",
"display_list.cc",
"display_list.h",
"display_list_attributes.h",
"display_list_blend_mode.cc",
"display_list_blend_mode.h",
"display_list_builder.cc",
"display_list_builder.h",
"display_list_color.h",
"display_list_color_filter.cc",
"display_list_color_filter.h",
"display_list_color_source.cc",
"display_list_color_source.h",
"display_list_complexity.cc",
"display_list_complexity.h",
"display_list_complexity_gl.cc",
"display_list_complexity_gl.h",
"display_list_complexity_metal.cc",
"display_list_complexity_metal.h",
"display_list_flags.cc",
"display_list_flags.h",
"display_list_image.cc",
"display_list_image.h",
"display_list_image_filter.cc",
"display_list_image_filter.h",
"display_list_image_skia.cc",
"display_list_image_skia.h",
"display_list_mask_filter.cc",
"display_list_mask_filter.h",
"display_list_matrix_clip_tracker.cc",
"display_list_matrix_clip_tracker.h",
"display_list_ops.cc",
"display_list_ops.h",
"display_list_paint.cc",
"display_list_paint.h",
"display_list_path_effect.cc",
"display_list_path_effect.h",
"display_list_rtree.cc",
"display_list_rtree.h",
"display_list_runtime_effect.cc",
"display_list_runtime_effect.h",
"display_list_sampling_options.h",
"display_list_tile_mode.h",
"display_list_utils.cc",
"display_list_utils.h",
"display_list_vertices.cc",
"display_list_vertices.h",
"dl_attributes.h",
"dl_blend_mode.cc",
"dl_blend_mode.h",
"dl_builder.cc",
"dl_builder.h",
"dl_canvas.cc",
"dl_canvas.h",
"dl_color.h",
"dl_op_flags.cc",
"dl_op_flags.h",
"dl_op_receiver.cc",
"dl_op_receiver.h",
"dl_op_records.cc",
"dl_op_records.h",
"dl_paint.cc",
"dl_paint.h",
"dl_sampling_options.h",
"dl_tile_mode.h",
"dl_vertices.cc",
"dl_vertices.h",
"effects/dl_color_filter.cc",
"effects/dl_color_filter.h",
"effects/dl_color_source.cc",
"effects/dl_color_source.h",
"effects/dl_image_filter.cc",
"effects/dl_image_filter.h",
"effects/dl_mask_filter.cc",
"effects/dl_mask_filter.h",
"effects/dl_path_effect.cc",
"effects/dl_path_effect.h",
"effects/dl_runtime_effect.cc",
"effects/dl_runtime_effect.h",
"geometry/dl_rtree.cc",
"geometry/dl_rtree.h",
"image/dl_image.cc",
"image/dl_image.h",
"image/dl_image_skia.cc",
"image/dl_image_skia.h",
"skia/dl_sk_canvas.cc",
"skia/dl_sk_canvas.h",
"skia/dl_sk_conversions.cc",
"skia/dl_sk_conversions.h",
"skia/dl_sk_dispatcher.cc",
"skia/dl_sk_dispatcher.h",
"skia/dl_sk_utils.cc",
"skia/dl_sk_utils.h",
"types.h",
"skia/dl_sk_paint_dispatcher.cc",
"skia/dl_sk_paint_dispatcher.h",
"skia/dl_sk_types.h",
"utils/dl_bounds_accumulator.cc",
"utils/dl_bounds_accumulator.h",
"utils/dl_matrix_clip_tracker.cc",
"utils/dl_matrix_clip_tracker.h",
"utils/dl_receiver_utils.cc",
"utils/dl_receiver_utils.h",
]

public_configs = [ ":display_list_config" ]
Expand All @@ -100,20 +102,20 @@ if (enable_unittests) {
testonly = true

sources = [
"display_list_color_filter_unittests.cc",
"display_list_color_source_unittests.cc",
"display_list_color_unittests.cc",
"display_list_complexity_unittests.cc",
"display_list_image_filter_unittests.cc",
"display_list_mask_filter_unittests.cc",
"display_list_matrix_clip_tracker_unittests.cc",
"display_list_paint_unittests.cc",
"display_list_path_effect_unittests.cc",
"display_list_rtree_unittests.cc",
"benchmarking/dl_complexity_unittests.cc",
"display_list_unittests.cc",
"display_list_vertices_unittests.cc",
"dl_color_unittests.cc",
"dl_paint_unittests.cc",
"dl_vertices_unittests.cc",
"effects/dl_color_filter_unittests.cc",
"effects/dl_color_source_unittests.cc",
"effects/dl_image_filter_unittests.cc",
"effects/dl_mask_filter_unittests.cc",
"effects/dl_path_effect_unittests.cc",
"geometry/dl_rtree_unittests.cc",
"skia/dl_sk_conversions_unittests.cc",
"skia/dl_sk_utils_unittests.cc",
"skia/dl_sk_paint_dispatcher_unittests.cc",
"utils/dl_matrix_clip_tracker_unittests.cc",
]

deps = [
Expand Down Expand Up @@ -141,7 +143,7 @@ if (enable_unittests) {
executable("display_list_rendertests") {
testonly = true

sources = [ "dl_rendering_unittests.cc" ]
sources = [ "testing/dl_rendering_unittests.cc" ]

deps = [
":display_list",
Expand Down Expand Up @@ -169,7 +171,7 @@ if (enable_unittests) {
executable("display_list_builder_benchmarks") {
testonly = true

sources = [ "display_list_builder_benchmarks.cc" ]
sources = [ "benchmarking/dl_builder_benchmarks.cc" ]

deps = [
":display_list",
Expand All @@ -189,8 +191,8 @@ source_set("display_list_benchmarks_source") {
testonly = true

sources = [
"display_list_benchmarks.cc",
"display_list_benchmarks.h",
"benchmarking/dl_benchmarks.cc",
"benchmarking/dl_benchmarks.h",
]

deps = [
Expand Down
7 changes: 4 additions & 3 deletions display_list/display_list_benchmarks.cc → display_list/benchmarking/dl_benchmarks.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/display_list/display_list_benchmarks.h"
#include "flutter/display_list/display_list_builder.h"
#include "flutter/display_list/display_list_flags.h"
#include "flutter/display_list/benchmarking/dl_benchmarks.h"
#include "flutter/display_list/dl_builder.h"
#include "flutter/display_list/dl_op_flags.h"
#include "flutter/display_list/skia/dl_sk_canvas.h"

#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/core/SkTextBlob.h"
Expand Down
10 changes: 5 additions & 5 deletions display_list/display_list_benchmarks.h → display_list/benchmarking/dl_benchmarks.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_

#include "flutter/display_list/display_list_sampling_options.h"
#include "flutter/display_list/display_list_vertices.h"
#include "flutter/display_list/dl_canvas.h"
#include "flutter/display_list/dl_sampling_options.h"
#include "flutter/display_list/dl_vertices.h"
#include "flutter/display_list/testing/dl_test_surface_provider.h"

#include "third_party/benchmark/include/benchmark/benchmark.h"
Expand Down Expand Up @@ -587,4 +587,4 @@ void BM_SaveLayer(benchmark::State& state,
} // namespace testing
} // namespace flutter

#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_BENCHMARKS_H_
0 ...y_list/display_list_builder_benchmarks.cc → ...ist/benchmarking/dl_builder_benchmarks.cc
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions display_list/display_list_complexity.cc → display_list/benchmarking/dl_complexity.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/display_list/display_list_complexity.h"
#include "flutter/display_list/benchmarking/dl_complexity.h"
#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
#include "flutter/display_list/benchmarking/dl_complexity_metal.h"
#include "flutter/display_list/display_list.h"
#include "flutter/display_list/display_list_complexity_gl.h"
#include "flutter/display_list/display_list_complexity_metal.h"

namespace flutter {

Expand Down
8 changes: 4 additions & 4 deletions display_list/display_list_complexity.h → display_list/benchmarking/dl_complexity.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_

#include "flutter/display_list/display_list.h"
#include "flutter/display_list/types.h"

#include "third_party/skia/include/gpu/GrTypes.h"

namespace flutter {
Expand Down Expand Up @@ -55,4 +55,4 @@ class DisplayListNaiveComplexityCalculator

} // namespace flutter

#endif // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_H_
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_H_
2 changes: 1 addition & 1 deletion display_list/display_list_complexity_gl.cc → ...lay_list/benchmarking/dl_complexity_gl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/display_list/display_list_complexity_gl.h"
#include "flutter/display_list/benchmarking/dl_complexity_gl.h"

// The numbers and weightings used in this file stem from taking the
// data from the DisplayListBenchmarks suite run on an Pixel 4 and
Expand Down
8 changes: 4 additions & 4 deletions display_list/display_list_complexity_gl.h → display_list/benchmarking/dl_complexity_gl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_

#include "flutter/display_list/display_list_complexity_helper.h"
#include "flutter/display_list/benchmarking/dl_complexity_helper.h"

namespace flutter {

Expand Down Expand Up @@ -98,4 +98,4 @@ class DisplayListGLComplexityCalculator

} // namespace flutter

#endif // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_GL_H_
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_GL_H_
12 changes: 6 additions & 6 deletions ...lay_list/display_list_complexity_helper.h → ..._list/benchmarking/dl_complexity_helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_HELPER_H_
#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_HELPER_H_
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_COMPLEXITY_HELPER_H_
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_COMPLEXITY_HELPER_H_

#include "flutter/display_list/display_list_blend_mode.h"
#include "flutter/display_list/display_list_complexity.h"
#include "flutter/display_list/display_list_utils.h"
#include "flutter/display_list/benchmarking/dl_complexity.h"
#include "flutter/display_list/dl_blend_mode.h"
#include "flutter/display_list/dl_op_receiver.h"
#include "flutter/display_list/utils/dl_receiver_utils.h"

namespace flutter {

Expand Down Expand Up @@ -269,4 +269,4 @@ class ComplexityCalculatorHelper

} // namespace flutter

#endif // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_HELPER_H_
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_COMPLEXITY_HELPER_H_
2 changes: 1 addition & 1 deletion ...lay_list/display_list_complexity_metal.cc → ..._list/benchmarking/dl_complexity_metal.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/display_list/display_list_complexity_metal.h"
#include "flutter/display_list/benchmarking/dl_complexity_metal.h"

// The numbers and weightings used in this file stem from taking the
// data from the DisplayListBenchmarks suite run on an iPhone 12 and
Expand Down
8 changes: 4 additions & 4 deletions display_list/display_list_complexity_metal.h → ...y_list/benchmarking/dl_complexity_metal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_METAL_H_
#define FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_METAL_H_
#ifndef FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
#define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_

#include "flutter/display_list/display_list_complexity_helper.h"
#include "flutter/display_list/benchmarking/dl_complexity_helper.h"

namespace flutter {

Expand Down Expand Up @@ -98,4 +98,4 @@ class DisplayListMetalComplexityCalculator

} // namespace flutter

#endif // FLUTTER_FLOW_DISPLAY_LIST_COMPLEXITY_METAL_H_
#endif // FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKING_DL_COMPLEXITY_METAL_H_
12 changes: 7 additions & 5 deletions ...list/display_list_complexity_unittests.cc → ...t/benchmarking/dl_complexity_unittests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "flutter/display_list/benchmarking/dl_complexity.h"
#include "flutter/display_list/benchmarking/dl_complexity_gl.h"
#include "flutter/display_list/benchmarking/dl_complexity_metal.h"
#include "flutter/display_list/display_list.h"
#include "flutter/display_list/display_list_builder.h"
#include "flutter/display_list/display_list_complexity.h"
#include "flutter/display_list/display_list_complexity_gl.h"
#include "flutter/display_list/display_list_complexity_metal.h"
#include "flutter/display_list/display_list_sampling_options.h"
#include "flutter/display_list/dl_builder.h"
#include "flutter/display_list/dl_sampling_options.h"
#include "flutter/display_list/testing/dl_test_snippets.h"
#include "flutter/testing/testing.h"

#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"

namespace flutter {
Expand Down
Loading

0 comments on commit ee6969d

Please sign in to comment.