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

Commit f5197ab

Browse files
LongCatIsLooongLongCatIsLooong
committed
Merge remote-tracking branch 'upstream/master' into android-platform-keys
2 parents 14055bf + af0ace6 commit f5197ab

File tree

230 files changed

+7558
-3436
lines changed

Some content is hidden

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

230 files changed

+7558
-3436
lines changed

‎BUILD.gn‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ config("config") {
2121
}
2222
}
2323

24+
defines = []
25+
2426
# This define is transitional and will be removed after the embedder API
2527
# transition is complete.
2628
#
2729
# TODO(bugs.fuchsia.dev/54041): Remove when no longer necessary.
2830
if (is_fuchsia && flutter_enable_legacy_fuchsia_embedder) {
29-
defines = [ "LEGACY_FUCHSIA_EMBEDDER" ]
31+
defines += [ "LEGACY_FUCHSIA_EMBEDDER" ]
3032
}
3133

3234
if (is_debug) {
33-
defines = [ "FLUTTER_ENABLE_DIFF_CONTEXT" ]
35+
defines += [ "FLUTTER_ENABLE_DIFF_CONTEXT" ]
3436
}
3537
}
3638

@@ -52,8 +54,8 @@ group("flutter") {
5254

5355
# Flutter SDK artifacts should only be built when either doing host builds, or
5456
# for cross-compiled desktop targets.
55-
build_engine_artifacts =
56-
current_toolchain == host_toolchain || (is_linux && !is_chromeos)
57+
build_engine_artifacts = current_toolchain == host_toolchain ||
58+
(is_linux && !is_chromeos) || is_mac
5759

5860
# If enbaled, compile the SDK / snapshot.
5961
if (!is_fuchsia) {

‎DEPS‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ vars = {
2727
'skia_git': 'https://skia.googlesource.com',
2828
# OCMock is for testing only so there is no google clone
2929
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
30-
'skia_revision': 'adcf2ef54ec64d90a4b8733cf9d42e6476f8ad7c',
30+
'skia_revision': 'cb41df0bfad4779a404f2ceb3e5b68ddd1eb7c07',
3131

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

4040
# WARNING: DO NOT EDIT MANUALLY
4141
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -45,7 +45,7 @@ vars = {
4545
'dart_collection_rev': '9967dcd3d7645db6de48d5abfab3018bb0c84236',
4646
'dart_http_throttle_tag': '1.0.2',
4747
'dart_intl_tag': '0.17.0-nullsafety',
48-
'dart_linter_tag': '1.3.0',
48+
'dart_linter_tag': '1.4.0',
4949
'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
5050
'dart_pub_rev': '0e657414a472e74ca5dd76ae0db50cc060251dec',
5151
'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
@@ -96,7 +96,7 @@ allowed_hosts = [
9696
]
9797

9898
deps = {
99-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '45ce223bc8d8ca88e2eb2f38eb0cf799e39edd06',
99+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3a3422d5f3b2c3ff237d855a6906d6d7533e4af4',
100100

101101
# Fuchsia compatibility
102102
#
@@ -107,9 +107,6 @@ deps = {
107107
'src/third_party/benchmark':
108108
Var('fuchsia_git') + '/third_party/benchmark' + '@' + 'a779ffce872b4c811beef482e18bd0b63626aa42',
109109

110-
'src/third_party/googletest':
111-
Var('fuchsia_git') + '/third_party/googletest' + '@' + '3fef9015bfe7617d57806cd7c73a653b28559fae',
112-
113110
'src/third_party/rapidjson':
114111
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
115112

@@ -138,6 +135,9 @@ deps = {
138135

139136
'src/third_party/khronos':
140137
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',
138+
139+
'src/third_party/googletest':
140+
Var('github_git') + '/google/googletest' + '@' + 'f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4',
141141

142142
'src/third_party/boringssl':
143143
Var('github_git') + '/dart-lang/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
@@ -154,7 +154,7 @@ deps = {
154154
Var('dart_git') + '/args.git@d8fea36c10ef96797be02e3d132d572445cd86f4',
155155

156156
'src/third_party/dart/third_party/pkg/async':
157-
Var('dart_git') + '/async.git@376c0fe95fa6fe7a5a6c41ef7b4585085c826f89',
157+
Var('dart_git') + '/async.git@cde00b89bd3c19e877b21de2c02282d4d311d0a5',
158158

159159
'src/third_party/dart/third_party/pkg/bazel_worker':
160160
Var('dart_git') + '/bazel_worker.git@0885637b037979afbf5bcd05fd748b309fd669c0',
@@ -205,10 +205,10 @@ deps = {
205205
Var('dart_git') + '/html.git@00cd3c22dac0e68e6ed9e7e4945101aedb1b3109',
206206

207207
'src/third_party/dart/third_party/pkg/http':
208-
Var('dart_git') + '/http.git@69d6064dd92470ed7ccd50a808fc789ee7716fe8',
208+
Var('dart_git') + '/http.git@abb2bb182fbd7f03aafd1f889b902d7b3bdb8769',
209209

210210
'src/third_party/dart/third_party/pkg/http_multi_server':
211-
Var('dart_git') + '/http_multi_server.git@7aca9e87d4a68374b685334f20359320054b8d7b',
211+
Var('dart_git') + '/http_multi_server.git@de1b312164c24a1690b46c6e97bd47eff40c4649',
212212

213213
'src/third_party/dart/third_party/pkg/http_parser':
214214
Var('dart_git') + '/http_parser.git@7720bfd42a0c096734c5213478fdce92c62f0293',
@@ -307,7 +307,7 @@ deps = {
307307
Var('dart_git') + '/term_glyph.git@6a0f9b6fb645ba75e7a00a4e20072678327a0347',
308308

309309
'src/third_party/dart/third_party/pkg/test':
310-
Var('dart_git') + '/test.git@e673623f45d75ccec750d35271b0b4d1423e9fac',
310+
Var('dart_git') + '/test.git@433f1d8726f9c1484007588470b17830a5e97a12',
311311

312312
'src/third_party/dart/third_party/pkg/test_reflective_loader':
313313
Var('dart_git') + '/test_reflective_loader.git@54e930a11c372683792e22bddad79197728c91ce',
@@ -322,7 +322,7 @@ deps = {
322322
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
323323

324324
'src/third_party/dart/third_party/pkg/web_socket_channel':
325-
Var('dart_git') + '/web_socket_channel.git@d3e100de8feb0283a04732366bb591ebd2282d7d',
325+
Var('dart_git') + '/web_socket_channel.git@6448ce532445a8a458fa191d9346df071ae0acad',
326326

327327
'src/third_party/dart/third_party/pkg/yaml':
328328
Var('dart_git') + '/yaml.git@b4c4411631bda556ce9a45af1ab0eecaf9f3ac53',
@@ -537,7 +537,7 @@ deps = {
537537
'packages': [
538538
{
539539
'package': 'fuchsia/sdk/core/mac-amd64',
540-
'version': 'RgZnCZ5ngRYrcqEqhl3vMA5K2V4E09fR4SX6z-_oR5oC'
540+
'version': '4VJj6gJdUnuEkgNnGIgpLgVgSHT4hGDb5-H8lWyVfdQC'
541541
}
542542
],
543543
'condition': 'host_os == "mac"',
@@ -547,19 +547,30 @@ deps = {
547547
'packages': [
548548
{
549549
'package': 'fuchsia/sdk/core/linux-amd64',
550-
'version': '4numS0K6TAgTzLt_Y7F8xzrU2jhmR651iTLmjQaoN9oC'
550+
'version': '4fB2dR4mPn21rI--QN-zD_Ypt6z3P2EZHvneZ5yFoQYC'
551551
}
552552
],
553553
'condition': 'host_os == "linux"',
554554
'dep_type': 'cipd',
555555
},
556556

557+
# Windows SDK
558+
'src/third_party/windows_sdk': {
559+
'packages': [
560+
{
561+
'package': 'flutter/windows/windows-sdk',
562+
'version': 'build:10.0.19041.0'
563+
}
564+
],
565+
'condition': 'download_windows_deps',
566+
'dep_type': 'cipd',
567+
},
557568
# CppWinRT tooling for UWP builds
558569
'src/third_party/cppwinrt': {
559570
'packages': [
560571
{
561572
'package': 'flutter/cppwinrt/win-amd64',
562-
'version': 'build:2.0.210304.5'
573+
'version': 'build:2.0.210505.3'
563574
}
564575
],
565576
'condition': 'download_windows_deps',
@@ -662,7 +673,7 @@ hooks = [
662673
'pattern': '.',
663674
'condition': 'download_windows_deps',
664675
'action': [
665-
'python',
676+
'python3',
666677
'src/build/win/generate_winrt_headers.py',
667678
]
668679
}

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Flutter Engine
33

44
[![Build Status - Cirrus][]][Build status]
55

6-
Flutter is Google's mobile app SDK for crafting high-quality native interfaces
7-
in record time. Flutter works with existing code, is used by developers and
8-
organizations around the world, and is free and open source.
6+
Flutter is Google's SDK for crafting beautiful, fast user experiences for
7+
mobile, web, and desktop from a single codebase. Flutter works with existing
8+
code, is used by developers and organizations around the world, and is free
9+
and open source.
910

1011
The Flutter Engine is a portable runtime for hosting
1112
[Flutter](https://flutter.dev) applications. It implements Flutter's core

‎ci/firebase_testlab.sh‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,18 @@ if [[ ! -f "$APP" ]]; then
1818
fi
1919

2020
GIT_REVISION="${2:-$(git rev-parse HEAD)}"
21-
BUILD_ID="${3:-$CIRRUS_BUILD_ID}"
22-
23-
if [[ -n $GCLOUD_FIREBASE_TESTLAB_KEY ]]; then
24-
# New contributors will not have permissions to run this test - they won't be
25-
# able to access the service account information. We should just mark the test
26-
# as passed - it will run fine on post submit, where it will still catch
27-
# failures.
28-
# We can also still make sure that building a release app bundle still works.
29-
if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then
30-
echo "This user does not have permission to run this test."
31-
exit 0
32-
fi
33-
34-
echo "$GCLOUD_FIREBASE_TESTLAB_KEY" > "${HOME}/gcloud-service-key.json"
35-
gcloud auth activate-service-account --key-file="${HOME}/gcloud-service-key.json"
36-
fi
21+
BUILD_ID="${3:-$SWARMING_TASK_ID}"
3722

3823
# Run the test.
3924
# game-loop tests are meant for OpenGL apps.
4025
# This type of test will give the application a handle to a file, and
4126
# we'll write the timeline JSON to that file.
4227
# See https://firebase.google.com/docs/test-lab/android/game-loop
28+
# Pixel 4. As of this commit, this is a highly available device in FTL.
4329
gcloud --project flutter-infra firebase test android run \
4430
--type game-loop \
4531
--app "$APP" \
4632
--timeout 2m \
4733
--results-bucket=gs://flutter_firebase_testlab \
4834
--results-dir="engine_scenario_test/$GIT_REVISION/$BUILD_ID" \
49-
--no-auto-google-login
35+
--device model=flame,version=29

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ FILE: ../../../flutter/flow/embedded_views.h
4242
FILE: ../../../flutter/flow/flow_run_all_unittests.cc
4343
FILE: ../../../flutter/flow/flow_test_utils.cc
4444
FILE: ../../../flutter/flow/flow_test_utils.h
45+
FILE: ../../../flutter/flow/frame_timings.cc
46+
FILE: ../../../flutter/flow/frame_timings.h
47+
FILE: ../../../flutter/flow/frame_timings_recorder_unittests.cc
4548
FILE: ../../../flutter/flow/gl_context_switch_unittests.cc
4649
FILE: ../../../flutter/flow/instrumentation.cc
4750
FILE: ../../../flutter/flow/instrumentation.h
@@ -482,25 +485,29 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart
482485
FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom_canvas.dart
483486
FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom_renderer.dart
484487
FILE: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart
488+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart
485489
FILE: ../../../flutter/lib/web_ui/lib/src/engine/frame_reference.dart
486490
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/backdrop_filter.dart
487491
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/canvas.dart
488492
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/clip.dart
489493
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/color_filter.dart
490494
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/debug_canvas_reuse_overlay.dart
491495
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/image_filter.dart
496+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/offscreen_canvas.dart
492497
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/offset.dart
493498
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/opacity.dart
494499
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/painting.dart
495500
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/conic.dart
496501
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/cubic.dart
497502
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path.dart
503+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_iterator.dart
498504
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_metrics.dart
499505
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_ref.dart
500506
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_to_svg.dart
501507
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_utils.dart
502508
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/path_windings.dart
503509
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path/tangent.dart
510+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/path_to_svg_clip.dart
504511
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/picture.dart
505512
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
506513
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
@@ -511,6 +518,8 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart
511518
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/normalized_gradient.dart
512519
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/shader.dart
513520
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/shader_builder.dart
521+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/vertex_shaders.dart
522+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shaders/webgl_context.dart
514523
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface.dart
515524
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/surface_stats.dart
516525
FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/transform.dart
@@ -1112,6 +1121,7 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterView
11121121
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Info.plist
11131122
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.h
11141123
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.mm
1124+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegateTest.mm
11151125
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
11161126
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
11171127
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.mm
@@ -1148,6 +1158,8 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeybo
11481158
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.mm
11491159
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManagerUnittests.mm
11501160
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMacOSExternalTexture.h
1161+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.h
1162+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.mm
11511163
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalRenderer.h
11521164
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalRenderer.mm
11531165
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalRendererTest.mm
@@ -1373,6 +1385,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/inlines.h
13731385
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/logging.h
13741386
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
13751387
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.h
1388+
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.cc
1389+
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/root_inspect_node.h
13761390
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc
13771391
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.h
13781392
FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.cc
@@ -1473,6 +1487,8 @@ FILE: ../../../flutter/shell/platform/linux/fl_standard_method_codec.cc
14731487
FILE: ../../../flutter/shell/platform/linux/fl_standard_method_codec_test.cc
14741488
FILE: ../../../flutter/shell/platform/linux/fl_string_codec.cc
14751489
FILE: ../../../flutter/shell/platform/linux/fl_string_codec_test.cc
1490+
FILE: ../../../flutter/shell/platform/linux/fl_task_runner.cc
1491+
FILE: ../../../flutter/shell/platform/linux/fl_task_runner.h
14761492
FILE: ../../../flutter/shell/platform/linux/fl_text_input_plugin.cc
14771493
FILE: ../../../flutter/shell/platform/linux/fl_text_input_plugin.h
14781494
FILE: ../../../flutter/shell/platform/linux/fl_value.cc
@@ -1567,6 +1583,9 @@ FILE: ../../../flutter/shell/platform/windows/platform_handler_win32.h
15671583
FILE: ../../../flutter/shell/platform/windows/platform_handler_winuwp.cc
15681584
FILE: ../../../flutter/shell/platform/windows/platform_handler_winuwp.h
15691585
FILE: ../../../flutter/shell/platform/windows/public/flutter_windows.h
1586+
FILE: ../../../flutter/shell/platform/windows/registry.cc
1587+
FILE: ../../../flutter/shell/platform/windows/registry.h
1588+
FILE: ../../../flutter/shell/platform/windows/registry_unittests.cc
15701589
FILE: ../../../flutter/shell/platform/windows/string_conversion.cc
15711590
FILE: ../../../flutter/shell/platform/windows/string_conversion.h
15721591
FILE: ../../../flutter/shell/platform/windows/string_conversion_unittests.cc

0 commit comments

Comments
 (0)