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

Commit 0339d06

Browse files
LongCatIsLooongLongCatIsLooong
committed
Merge remote-tracking branch 'upstream/master' into textinputplugin-no-echoing
2 parents a33db84 + ca05bdc commit 0339d06

File tree

291 files changed

+10534
-3852
lines changed

Some content is hidden

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

291 files changed

+10534
-3852
lines changed

‎.cirrus.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,9 @@ task:
4040
ninja -C out/host_release
4141
benchmark_host_script: |
4242
cd $ENGINE_PATH/src/out/host_release/
43-
./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
44-
./fml_benchmarks --benchmark_format=json > fml_benchmarks.json
45-
./shell_benchmarks --benchmark_format=json > shell_benchmarks.json
46-
./ui_benchmarks --benchmark_format=json > ui_benchmarks.json
43+
$ENGINE_PATH/src/flutter/testing/benchmark/generate_metrics.sh
4744
cd $ENGINE_PATH/src/flutter/testing/benchmark
48-
pub get
49-
dart bin/parse_and_send.dart ../../../out/host_release/txt_benchmarks.json
50-
dart bin/parse_and_send.dart ../../../out/host_release/fml_benchmarks.json
51-
dart bin/parse_and_send.dart ../../../out/host_release/shell_benchmarks.json
52-
dart bin/parse_and_send.dart ../../../out/host_release/ui_benchmarks.json
45+
upload_metrics.sh
5346
5447
# The following test depends on Flutter framework repo. It may fail if the
5548
# framework repo is currently broken.
@@ -74,4 +67,4 @@ task:
7467
bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
7568
test_framework_script: |
7669
cd $FRAMEWORK_PATH/flutter/packages/flutter
77-
../../bin/flutter test --local-engine=host_debug_unopt
70+
../../bin/flutter test --local-engine=host_debug_unopt --null-assertions --sound-null-safety --enable-experiment=non-nullable

‎DEPS‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,33 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': 'be8004d2fb6c8575d7da7c580811639654a9d255',
29+
'skia_revision': 'f548a028ce702dd6964a26867efce23da5ffd5dd',
3030

3131
# When updating the Dart revision, ensure that all entries that are
3232
# dependencies of Dart are also updated to match the entries in the
3333
# Dart SDK's DEPS file for that revision of Dart. The DEPS file for
3434
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3535
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3636
# updated revision list of existing dependencies.
37-
'dart_revision': 'aaab579579bedd316956bec2e0853c4ad3c3fbb2',
37+
'dart_revision': '9c6e76468ca4b7886f0477af69b6fd0fb610b2e8',
3838

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
4141
'dart_args_tag': '1.6.0',
4242
'dart_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499',
4343
'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce',
44-
'dart_collection_rev': '7d44763d62f97698b15c08ee360d838dccb63c88',
45-
'dart_dart_style_tag': '1.3.7',
44+
'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3',
45+
'dart_collection_rev': '60e6ee2228586980826b07ec1df633bd879f42ea',
46+
'dart_dart_style_tag': '1.3.8',
4647
'dart_http_retry_tag': '0.1.1',
4748
'dart_http_throttle_tag': '1.0.2',
48-
'dart_intl_tag': '0.16.1',
49+
'dart_intl_tag': '0.17.0-nullsafety',
4950
'dart_linter_tag': '0.1.121',
5051
'dart_oauth2_tag': '1.6.0',
5152
'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
52-
'dart_pub_rev': 'f0c7771b38155d3829a60d60b5dba2784b100811',
53+
'dart_pub_rev': '5b4df5a6f931c63622ac349602d6ef0367e8070f',
5354
'dart_pub_semver_tag': 'v1.4.4',
54-
'dart_quiver-dart_tag': '246e754fe45cecb6aa5f3f13b4ed61037ff0d784',
55-
'dart_resource_rev': 'f8e37558a1c4f54550aa463b88a6a831e3e33cd6',
55+
'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
5656
'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8',
5757
'dart_shelf_packages_handler_tag': '2.0.0',
5858
'dart_shelf_proxy_tag': '0.1.0+7',
@@ -61,12 +61,12 @@ vars = {
6161
'dart_sse_tag': 'e5cf68975e8e87171a3dc297577aa073454a91dc',
6262
'dart_stack_trace_tag': '45319bfd2a6da228d8c32b06e1da02ad199373c7',
6363
'dart_stagehand_tag': 'v3.3.9',
64-
'dart_stream_channel_tag': 'c446774fd077c9bdbd6235a7aadc661ef60a9727',
64+
'dart_stream_channel_tag': 'd7251e61253ec389ee6e045ee1042311bced8f1d',
6565
'dart_test_reflective_loader_tag': '0.1.9',
6666
'dart_tflite_native_rev': '0.4.0+1',
6767
'dart_typed_data_tag': 'f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719',
6868
'dart_usage_tag': '3.4.0',
69-
'dart_watcher_rev': '5df2e364b0c3ec12b9ed9cf2eedb71f9ddf8b7cd',
69+
'dart_watcher_rev': '64e254eba16f56d41f10d72c0b1cb24e130e1f8b',
7070

7171
'ocmock_tag': 'v3.7.1',
7272

@@ -163,7 +163,7 @@ deps = {
163163
Var('dart_git') + '/args.git' + '@' + Var('dart_args_tag'),
164164

165165
'src/third_party/dart/third_party/pkg/async':
166-
Var('dart_git') + '/async.git@38ace5fa83697928d5f29911e346e6311dd00857',
166+
Var('dart_git') + '/async.git@6d2de25f208b011d79d056115256d3840229723b',
167167

168168
'src/third_party/dart/third_party/pkg/bazel_worker':
169169
Var('dart_git') + '/bazel_worker.git@26680d5e249b249c7216ab2fed0ac8ed4ee285c5',
@@ -172,11 +172,14 @@ deps = {
172172
Var('dart_git') + '/boolean_selector.git@665e6921ab246569420376f827bff4585dff0b14',
173173

174174
'src/third_party/dart/third_party/pkg/charcode':
175-
Var('dart_git') + '/charcode.git@4a685faba42d86ebd9d661eadd1e79d0a1c34c43',
175+
Var('dart_git') + '/charcode.git@bcd8a12c315b7a83390e4865ad847ecd9344cba2',
176176

177177
'src/third_party/dart/third_party/pkg/cli_util':
178178
Var('dart_git') + '/cli_util.git@335ed165887d0ec97c2a09173ebf22dcf56a6c4e',
179179

180+
'src/third_party/dart/third_party/pkg/clock':
181+
Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
182+
180183
'src/third_party/dart/third_party/pkg/collection':
181184
Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
182185

@@ -193,10 +196,10 @@ deps = {
193196
Var('dart_git') + '/dart2js_info.git@0632a623b08e1f601c7eba99e0186a581ae799e9',
194197

195198
'src/third_party/dart/third_party/pkg/dartdoc':
196-
Var('dart_git') + '/dartdoc.git@8f5f30e58bbc0f11f104888ee87f11cbd6b82cc7',
199+
Var('dart_git') + '/dartdoc.git@72c69f8659ce8823ce2dde9a4f758b0fa617ab5e',
197200

198201
'src/third_party/dart/third_party/pkg/ffi':
199-
Var('dart_git') + '/ffi.git@454ab0f9ea6bd06942a983238d8a6818b1357edb',
202+
Var('dart_git') + '/ffi.git@a90bd424116fb6f416337db67425171f2dc4c98f',
200203

201204
'src/third_party/dart/third_party/pkg/fixnum':
202205
Var('dart_git') + '/fixnum.git@16d3890c6dc82ca629659da1934e412292508bba',
@@ -208,13 +211,13 @@ deps = {
208211
Var('dart_git') + '/html.git@22f17e97fedeacaa1e945cf84d8016284eed33a6',
209212

210213
'src/third_party/dart/third_party/pkg/http':
211-
Var('dart_git') + '/http.git@ca418355b5fc60cf981de3bd7364ec0dd943fa8f',
214+
Var('dart_git') + '/http.git@a8efbef05a58919dc7aa2dab42198334f2459ffb',
212215

213216
'src/third_party/dart/third_party/pkg/http_multi_server':
214217
Var('dart_git') + '/http_multi_server.git@ea269f79321d659208402088f3297e8920a88ee6',
215218

216219
'src/third_party/dart/third_party/pkg/http_parser':
217-
Var('dart_git') + '/http_parser.git@6e63a97b5aaa2b4d1215fe01683e51fb73258e54',
220+
Var('dart_git') + '/http_parser.git@5dd4d16693242049dfb43b5efa429fedbf932e98',
218221

219222
'src/third_party/dart/third_party/pkg/http_retry':
220223
Var('dart_git') + '/http_retry.git' + '@' + Var('dart_http_retry_tag'),
@@ -232,10 +235,10 @@ deps = {
232235
Var('dart_git') + '/linter.git' + '@' + Var('dart_linter_tag'),
233236

234237
'src/third_party/dart/third_party/pkg/logging':
235-
Var('dart_git') + '/logging.git@1590ba0b648a51e7eb3895c612e4b72f72623b6f',
238+
Var('dart_git') + '/logging.git@9d2a7fdd05b09bc06474881152b5baaf38fd1329',
236239

237240
'src/third_party/dart/third_party/pkg/markdown':
238-
Var('dart_git') + '/markdown.git@dbeafd47759e7dd0a167602153bb9c49fb5e5fe7',
241+
Var('dart_git') + '/markdown.git@6f89681d59541ddb1cf3a58efbdaa2304ffc3f51',
239242

240243
'src/third_party/dart/third_party/pkg/matcher':
241244
Var('dart_git') + '/matcher.git@9cae8faa7868bf3a88a7ba45eb0bd128e66ac515',
@@ -270,9 +273,6 @@ deps = {
270273
'src/third_party/dart/third_party/pkg/pub_semver':
271274
Var('dart_git') + '/pub_semver.git' + '@' + Var('dart_pub_semver_tag'),
272275

273-
'src/third_party/dart/third_party/pkg/quiver':
274-
Var('chromium_git') + '/external/github.com/google/quiver-dart.git' + '@' + Var('dart_quiver-dart_tag'),
275-
276276
'src/third_party/dart/third_party/pkg/resource':
277277
Var('dart_git') + '/resource.git' + '@' + Var('dart_resource_rev'),
278278

@@ -516,7 +516,7 @@ deps = {
516516
'packages': [
517517
{
518518
'package': 'fuchsia/sdk/core/mac-amd64',
519-
'version': 'XZSNobQCTaaS8kszD0vwSYUk3rfYLRis_EDjQj-UaxoC'
519+
'version': 'xHjtLQPQ5Og776485v9Adp5iRwisBBPaYlzpqadtWB0C'
520520
}
521521
],
522522
'condition': 'host_os == "mac"',
@@ -536,7 +536,7 @@ deps = {
536536
'packages': [
537537
{
538538
'package': 'fuchsia/sdk/core/linux-amd64',
539-
'version': 'ZJHmp3INUrLtYTJzHkJ-mTGQ7F59bfv1usLDP7xS-XgC'
539+
'version': 'PY5hNI-wYtGdyQ17IQ4smgMrqX1-UzCc3tVEgkTWex0C'
540540
}
541541
],
542542
'condition': 'host_os == "linux"',

‎ci/dev/prod_builders.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
"repo":"engine"
2626
},
2727
{
28+
"name":"Linux Web Framework tests",
29+
"repo":"engine"
30+
},
31+
{
2832
"name":"Mac Android AOT Engine",
2933
"repo":"engine"
3034
},

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ FILE: ../../../flutter/lib/ui/painting/single_frame_codec.h
371371
FILE: ../../../flutter/lib/ui/painting/vertices.cc
372372
FILE: ../../../flutter/lib/ui/painting/vertices.h
373373
FILE: ../../../flutter/lib/ui/painting/vertices_unittests.cc
374+
FILE: ../../../flutter/lib/ui/platform_dispatcher.dart
374375
FILE: ../../../flutter/lib/ui/plugins.dart
375376
FILE: ../../../flutter/lib/ui/plugins/callback_cache.cc
376377
FILE: ../../../flutter/lib/ui/plugins/callback_cache.h
@@ -489,6 +490,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
489490
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
490491
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart
491492
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
493+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/normalized_gradient.dart
492494
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/shader.dart
493495
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart
494496
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface.dart
@@ -499,6 +501,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/keyboard.dart
499501
FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse_cursor.dart
500502
FILE: ../../../flutter/lib/web_ui/lib/src/engine/onscreen_logging.dart
501503
FILE: ../../../flutter/lib/web_ui/lib/src/engine/picture.dart
504+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
502505
FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views.dart
503506
FILE: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart
504507
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart
@@ -553,6 +556,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/ui/natives.dart
553556
FILE: ../../../flutter/lib/web_ui/lib/src/ui/painting.dart
554557
FILE: ../../../flutter/lib/web_ui/lib/src/ui/path.dart
555558
FILE: ../../../flutter/lib/web_ui/lib/src/ui/path_metrics.dart
559+
FILE: ../../../flutter/lib/web_ui/lib/src/ui/platform_dispatcher.dart
556560
FILE: ../../../flutter/lib/web_ui/lib/src/ui/pointer.dart
557561
FILE: ../../../flutter/lib/web_ui/lib/src/ui/semantics.dart
558562
FILE: ../../../flutter/lib/web_ui/lib/src/ui/test_embedding.dart
@@ -932,6 +936,8 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin
932936
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
933937
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Info.plist
934938
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
939+
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
940+
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate_Test.h
935941
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h
936942
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.mm
937943
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm
@@ -1010,8 +1016,6 @@ FILE: ../../../flutter/shell/platform/darwin/ios/ios_render_target_gl.h
10101016
FILE: ../../../flutter/shell/platform/darwin/ios/ios_render_target_gl.mm
10111017
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.h
10121018
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.mm
1013-
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_factory.h
1014-
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_factory.mm
10151019
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_gl.h
10161020
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_gl.mm
10171021
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_metal.h
@@ -1043,6 +1047,10 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExter
10431047
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTextureGL.mm
10441048
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
10451049
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.mm
1050+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h
1051+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.mm
1052+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h
1053+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.mm
10461054
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputModel.h
10471055
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputModel.mm
10481056
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h
@@ -1052,6 +1060,8 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.
10521060
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm
10531061
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
10541062
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h
1063+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/MacOSSwitchableGLContext.h
1064+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/MacOSSwitchableGLContext.mm
10551065
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/fixtures/flutter_desktop_test.dart
10561066
FILE: ../../../flutter/shell/platform/darwin/macos/framework/module.modulemap
10571067
FILE: ../../../flutter/shell/platform/embedder/assets/EmbedderInfo.plist
@@ -1290,6 +1300,8 @@ FILE: ../../../flutter/shell/platform/linux/fl_dart_project_private.h
12901300
FILE: ../../../flutter/shell/platform/linux/fl_dart_project_test.cc
12911301
FILE: ../../../flutter/shell/platform/linux/fl_engine.cc
12921302
FILE: ../../../flutter/shell/platform/linux/fl_engine_private.h
1303+
FILE: ../../../flutter/shell/platform/linux/fl_event_channel.cc
1304+
FILE: ../../../flutter/shell/platform/linux/fl_event_channel_test.cc
12931305
FILE: ../../../flutter/shell/platform/linux/fl_json_message_codec.cc
12941306
FILE: ../../../flutter/shell/platform/linux/fl_json_message_codec_test.cc
12951307
FILE: ../../../flutter/shell/platform/linux/fl_json_method_codec.cc
@@ -1341,6 +1353,7 @@ FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_codec
13411353
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h
13421354
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h
13431355
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_engine.h
1356+
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_event_channel.h
13441357
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h
13451358
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_json_method_codec.h
13461359
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_message_codec.h

0 commit comments

Comments
 (0)