From 571d08a5bbf522a829221c0edc6433bc4f0b2cfb Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Thu, 11 Jul 2019 15:12:30 -0700 Subject: [PATCH] Update flutter_web to latest (flutter/engine#9792) --- .../ci/licenses_golden/licenses_flutter | 15 +++ engine/src/flutter/web_sdk/BUILD.gn | 97 ++++--------------- engine/src/flutter/web_sdk/sdk_rewriter.dart | 3 +- 3 files changed, 35 insertions(+), 80 deletions(-) diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index 019b322b24c..7762d8304ab 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -232,13 +232,20 @@ FILE: ../../../flutter/lib/stub_ui/lib/src/engine/assets.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/bitmap_canvas.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/browser_detection.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/browser_location.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/canvas.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/engine_delegate.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/initialization.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/layer.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/layer_scene_builder.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/layer_tree.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/matrix.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/path.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/picture.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/picture_recorder.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/platform_message.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/raster_cache.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/rasterizer.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/recording_canvas.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/runtime_delegate.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/surface.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/compositor/viewport_metrics.dart @@ -252,24 +259,31 @@ FILE: ../../../flutter/lib/stub_ui/lib/src/engine/html_image_codec.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/keyboard.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/onscreen_logging.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/path_to_svg.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/platform_views.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/pointer_binding.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/recording_canvas.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/accessibility.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/checkable.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/image.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/incrementable.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/label_and_value.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/live_region.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/scrollable.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/semantics.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/tappable.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/semantics/text_field.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/services/buffers.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/services/message_codec.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/services/message_codecs.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/services/serialization.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/shadow.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/backdrop_filter.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/clip.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/debug_canvas_reuse_overlay.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/offset.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/opacity.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/picture.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/platform_view.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/scene.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/surface.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/surface/transform.dart @@ -277,6 +291,7 @@ FILE: ../../../flutter/lib/stub_ui/lib/src/engine/test_embedding.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/font_collection.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/line_breaker.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/measurement.dart +FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/paragraph.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/ruler.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/unicode_range.dart FILE: ../../../flutter/lib/stub_ui/lib/src/engine/text/word_break_properties.dart diff --git a/engine/src/flutter/web_sdk/BUILD.gn b/engine/src/flutter/web_sdk/BUILD.gn index bff151e2b1f..41cb322b436 100644 --- a/engine/src/flutter/web_sdk/BUILD.gn +++ b/engine/src/flutter/web_sdk/BUILD.gn @@ -8,86 +8,25 @@ import("//third_party/dart/utils/compile_platform.gni") sdk_dill = "$root_out_dir/flutter_web_sdk/kernel/flutter_ddc_sdk.dill" sdk_libraries_json = "$root_out_dir/flutter_web_sdk/libraries.json" -web_ui_sources = [ - "$flutter_root/lib/stub_ui/lib/ui.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/compositing.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/hash_codes.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/canvas.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/initialization.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/lerp.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/window.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/pointer.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/painting.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/semantics.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/natives.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/geometry.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/text.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/test_embedding.dart", - "$flutter_root/lib/stub_ui/lib/src/ui/tile_mode.dart", -] +web_ui_sources = + exec_script("//third_party/dart/tools/list_dart_files.py", + [ + "absolute", + rebase_path("$flutter_root/lib/stub_ui/lib/src/ui"), + ], + "list lines") -web_engine_sources = [ - "$flutter_root/lib/stub_ui/lib/src/engine.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/vector_math.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/shadow.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/keyboard.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/assets.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/engine_canvas.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/path_to_svg.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/window.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text_editing.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/label_and_value.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/tappable.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/semantics.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/image.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/incrementable.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/checkable.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/text_field.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/semantics/scrollable.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/pointer_binding.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/validators.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/bitmap_canvas.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/history.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/houdini_canvas.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/conic.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/unicode_range.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/word_breaker.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/line_breaker.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/measurement.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/font_collection.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/word_break_properties.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/text/ruler.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/browser_detection.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/util.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/alarm_clock.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/layer.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/layer_tree.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/engine_delegate.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/raster_cache.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/viewport_metrics.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/layer_scene_builder.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/runtime_delegate.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/platform_message.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/surface.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/compositor/rasterizer.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/recording_canvas.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/dom_renderer.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/test_embedding.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/html_image_codec.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/opacity.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/scene.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/debug_canvas_reuse_overlay.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/clip.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/offset.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/picture.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/surface.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/surface/transform.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/browser_location.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/onscreen_logging.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/dom_canvas.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/services/message_codec.dart", - "$flutter_root/lib/stub_ui/lib/src/engine/services/message_codecs.dart", -] +web_ui_sources += [ "$flutter_root/lib/stub_ui/lib/ui.dart" ] + +web_engine_sources = + exec_script("//third_party/dart/tools/list_dart_files.py", + [ + "absolute", + rebase_path("$flutter_root/lib/stub_ui/lib/src/engine"), + ], + "list lines") + +web_engine_sources += [ "$flutter_root/lib/stub_ui/lib/src/engine.dart" ] group("web_sdk") { deps = [ diff --git a/engine/src/flutter/web_sdk/sdk_rewriter.dart b/engine/src/flutter/web_sdk/sdk_rewriter.dart index 0b242b2db22..5f90126bc1f 100644 --- a/engine/src/flutter/web_sdk/sdk_rewriter.dart +++ b/engine/src/flutter/web_sdk/sdk_rewriter.dart @@ -27,7 +27,8 @@ import 'dart:_engine' as engine; ], [ r''' -export 'src/engine.dart' show persistedPictureFactory, houdiniPictureFactory, webOnlyInitializeEngine; +export 'src/engine.dart' + show persistedPictureFactory, houdiniPictureFactory, platformViewRegistry; ''', r''' export 'dart:_engine' show persistedPictureFactory, houdiniPictureFactory, webOnlyInitializeEngine;