Skip to content

Commit cde8970

Browse files
harryterkelsenkorca0220
authored andcommitted
[web] Refactor LayerScene out of CanvasKit (flutter#174375)
Moves the `LayerSceneBuilder` code out of CanvasKit and into a higher-level directory under `engine/`. This is in preparation for the code to be shared between the CanvasKit and Skwasm renderers. See flutter#172311 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent b34cf13 commit cde8970

37 files changed

+1331
-1206
lines changed

engine/src/flutter/lib/web_ui/lib/src/engine.dart

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,33 @@ export 'engine/arena.dart';
2121
export 'engine/browser_detection.dart';
2222
export 'engine/canvaskit/canvas.dart';
2323
export 'engine/canvaskit/canvaskit_api.dart';
24-
export 'engine/canvaskit/canvaskit_canvas.dart';
2524
export 'engine/canvaskit/color_filter.dart';
26-
export 'engine/canvaskit/display_canvas_factory.dart';
27-
export 'engine/canvaskit/embedded_views.dart';
2825
export 'engine/canvaskit/fonts.dart';
2926
export 'engine/canvaskit/image.dart';
3027
export 'engine/canvaskit/image_filter.dart';
3128
export 'engine/canvaskit/image_wasm_codecs.dart';
3229
export 'engine/canvaskit/image_web_codecs.dart';
33-
export 'engine/canvaskit/layer.dart';
34-
export 'engine/canvaskit/layer_scene_builder.dart';
35-
export 'engine/canvaskit/layer_tree.dart';
36-
export 'engine/canvaskit/layer_visitor.dart';
3730
export 'engine/canvaskit/mask_filter.dart';
3831
export 'engine/canvaskit/multi_surface_rasterizer.dart';
39-
export 'engine/canvaskit/n_way_canvas.dart';
4032
export 'engine/canvaskit/native_memory.dart';
4133
export 'engine/canvaskit/offscreen_canvas_rasterizer.dart';
42-
export 'engine/canvaskit/overlay_scene_optimizer.dart';
4334
export 'engine/canvaskit/painting.dart';
4435
export 'engine/canvaskit/path.dart';
4536
export 'engine/canvaskit/path_metrics.dart';
4637
export 'engine/canvaskit/picture.dart';
4738
export 'engine/canvaskit/picture_recorder.dart';
48-
export 'engine/canvaskit/raster_cache.dart';
49-
export 'engine/canvaskit/rasterizer.dart';
50-
export 'engine/canvaskit/render_canvas.dart';
5139
export 'engine/canvaskit/renderer.dart';
5240
export 'engine/canvaskit/shader.dart';
5341
export 'engine/canvaskit/surface.dart';
5442
export 'engine/canvaskit/text.dart';
55-
export 'engine/canvaskit/text_fragmenter.dart';
5643
export 'engine/canvaskit/util.dart';
5744
export 'engine/canvaskit/vertices.dart';
5845
export 'engine/clipboard.dart';
5946
export 'engine/color_filter.dart';
47+
export 'engine/compositing/composition.dart';
48+
export 'engine/compositing/display_canvas_factory.dart';
49+
export 'engine/compositing/rasterizer.dart';
50+
export 'engine/compositing/render_canvas.dart';
6051
export 'engine/configuration.dart';
6152
export 'engine/display.dart';
6253
export 'engine/dom.dart';
@@ -77,6 +68,12 @@ export 'engine/js_interop/js_promise.dart';
7768
export 'engine/js_interop/js_typed_data.dart';
7869
export 'engine/key_map.g.dart';
7970
export 'engine/keyboard_binding.dart';
71+
export 'engine/layer/layer.dart';
72+
export 'engine/layer/layer_painting.dart';
73+
export 'engine/layer/layer_scene_builder.dart';
74+
export 'engine/layer/layer_tree.dart';
75+
export 'engine/layer/layer_visitor.dart';
76+
export 'engine/layer/n_way_canvas.dart';
8077
export 'engine/layers.dart';
8178
export 'engine/lazy_path.dart';
8279
export 'engine/mouse/context_menu.dart';
@@ -91,6 +88,7 @@ export 'engine/platform_dispatcher/app_lifecycle_state.dart';
9188
export 'engine/platform_dispatcher/view_focus_binding.dart';
9289
export 'engine/platform_views.dart';
9390
export 'engine/platform_views/content_manager.dart';
91+
export 'engine/platform_views/embedder.dart';
9492
export 'engine/platform_views/message_handler.dart';
9593
export 'engine/platform_views/slots.dart';
9694
export 'engine/plugins.dart';
@@ -147,6 +145,7 @@ export 'engine/text_editing/input_action.dart';
147145
export 'engine/text_editing/input_type.dart';
148146
export 'engine/text_editing/text_capitalization.dart';
149147
export 'engine/text_editing/text_editing.dart';
148+
export 'engine/text_fragmenter.dart';
150149
export 'engine/util.dart';
151150
export 'engine/validators.dart';
152151
export 'engine/vector_math.dart';

0 commit comments

Comments
 (0)