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

Commit 0b426fe

Browse files
harryterkelsenharryterkelsen
authored
Merge branch 'main' into canvaskit-html-img-element-decode
2 parents b207ee7 + 564ded4 commit 0b426fe

File tree

78 files changed

+2556
-3023
lines changed

Some content is hidden

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

78 files changed

+2556
-3023
lines changed

‎DEPS‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '9b789b35e1097668a804df5fdeca1d620fe241f9',
17+
'skia_revision': '939e1dac98150fb3873fef897113d9e1816a3a90',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,25 +56,25 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': 'b44d99ea2bf457e055d10c3244b68149ec3d827e',
59+
'dart_revision': '0f61238a27b0a4c1eb5b3981bf3f8ad9572f66eb',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6363
'dart_binaryen_rev': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
6464
'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
6565
'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
66-
'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
67-
'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
66+
'dart_browser_launcher_rev': 'fe7ffa13ba59ec6f7d56256f79059344555fdaf2',
67+
'dart_clock_rev': '6e43768a0b135a0d36fc886907b70c4bf27117e6',
6868
'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
6969
'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
7070
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7171
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
7373
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
7474
'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
75-
'dart_tools_rev': '43a8582a85d2220b5f1ca8383d97587792085b36',
75+
'dart_tools_rev': '6a07a1625f57c4b5844e26e51d30de0444a84763',
7676
'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
77-
'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
77+
'dart_web_rev': 'e89fe49d8a86845e49686b4578c56b67bdd7ba49',
7878
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
7979
'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
8080
'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
@@ -365,7 +365,7 @@ deps = {
365365
Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
366366

367367
'src/flutter/third_party/dart/third_party/pkg/cli_util':
368-
Var('dart_git') + '/cli_util.git@64192706344d0598784bebe1abc4a9bfc2608de0',
368+
Var('dart_git') + '/cli_util.git@6a0bb9292ea4bb2c9e547af03da4c9948f9556a1',
369369

370370
'src/flutter/third_party/dart/third_party/pkg/clock':
371371
Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -386,7 +386,7 @@ deps = {
386386
Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
387387

388388
'src/flutter/third_party/dart/third_party/pkg/dartdoc':
389-
Var('dart_git') + '/dartdoc.git@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
389+
Var('dart_git') + '/dartdoc.git@1d005239cbe30bac643d7471c6bae5166dc75c8b',
390390

391391
'src/flutter/third_party/dart/third_party/pkg/file':
392392
Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
@@ -401,7 +401,7 @@ deps = {
401401
Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
402402

403403
'src/flutter/third_party/dart/third_party/pkg/http':
404-
Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
404+
Var('dart_git') + '/http.git@757438e938ebe81f4b130e6372897b5f977615a6',
405405

406406
'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
407407
Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
@@ -434,7 +434,7 @@ deps = {
434434
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
435435

436436
'src/flutter/third_party/dart/third_party/pkg/native':
437-
Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',
437+
Var('dart_git') + '/native.git@b01a3f3ef5e3a219fefb182d4cfc41d2895f32ca',
438438

439439
'src/flutter/third_party/dart/third_party/pkg/package_config':
440440
Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
@@ -470,7 +470,7 @@ deps = {
470470
Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
471471

472472
'src/flutter/third_party/dart/third_party/pkg/stack_trace':
473-
Var('dart_git') + '/stack_trace.git@4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d',
473+
Var('dart_git') + '/stack_trace.git@090d3d186c085fdb913fe5350c666f8d0bd0f60f',
474474

475475
'src/flutter/third_party/dart/third_party/pkg/stream_channel':
476476
Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
@@ -485,7 +485,7 @@ deps = {
485485
Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
486486

487487
'src/flutter/third_party/dart/third_party/pkg/test':
488-
Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
488+
Var('dart_git') + '/test.git@2c2ac49de0e9d6ea9744c6e7990d5730806410c0',
489489

490490
'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
491491
Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -503,7 +503,7 @@ deps = {
503503
Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
504504

505505
'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
506-
Var('dart_git') + '/web_socket_channel.git@8e95ea75302180af075295f7dd7ffe922e26f789',
506+
Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
507507

508508
'src/flutter/third_party/dart/third_party/pkg/webdev':
509509
Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -969,7 +969,7 @@ deps = {
969969
'packages': [
970970
{
971971
'package': 'fuchsia/sdk/core/linux-amd64',
972-
'version': 'C_ze_BbJWtfB9GdOAJ8adc80nF1Yxh7jJp68b9hCxxMC'
972+
'version': 'PefNEmf1_cZtEGlZcuNOMmO9ELop_CUkN614w4shs44C'
973973
}
974974
],
975975
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎build/archives/BUILD.gn‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,16 @@ if (build_engine_artifacts && !is_android) {
5353
exe = ".exe"
5454
}
5555

56-
# Only include gen_snapshot for all runtime modes.
56+
# gen_snapshot is bundled for all runtime modes.
5757
files = [
5858
{
5959
source = "$root_out_dir/gen_snapshot$exe"
6060
destination = "gen_snapshot$exe"
6161
},
6262
]
63+
64+
# Host tooling/libraries that are used only in debug builds, or which are
65+
# identical across all runtime modes.
6366
if (flutter_runtime_mode == "debug") {
6467
dll = ".so"
6568
lib_prefix = "lib"
@@ -109,6 +112,9 @@ if (build_engine_artifacts && !is_android) {
109112
},
110113
]
111114
}
115+
116+
# On macOS, add entitlements.txt, which contains filenames of binaries that
117+
# need to be code-signed by a later CI stage.
112118
if (host_os == "mac") {
113119
deps += [ ":artifacts_entitlement_config" ]
114120
files += [
@@ -272,23 +278,7 @@ if (host_os == "win") {
272278
}
273279
}
274280

275-
# Archives Flutter Mac Artifacts
276281
if (is_mac) {
277-
zip_bundle("archive_gen_snapshot") {
278-
deps = [ "//flutter/lib/snapshot:create_macos_gen_snapshots" ]
279-
suffix = "-$flutter_runtime_mode"
280-
if (flutter_runtime_mode == "debug") {
281-
suffix = ""
282-
}
283-
output = "$full_platform_name$suffix/gen_snapshot.zip"
284-
files = [
285-
{
286-
source = "${root_out_dir}/gen_snapshot_${target_cpu}"
287-
destination = "gen_snapshot_${target_cpu}"
288-
},
289-
]
290-
}
291-
292282
group("flutter_embedder_framework") {
293283
deps = [
294284
"//flutter/shell/platform/embedder:flutter_embedder_framework_archive",

‎ci/builders/mac_host_engine.json‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
"ninja": {
4343
"config": "ci/host_debug",
4444
"targets": [
45-
"flutter/build/archives:archive_gen_snapshot",
4645
"flutter/build/archives:artifacts",
4746
"flutter/build/archives:dart_sdk_archive",
4847
"flutter/build/archives:flutter_embedder_framework",
4948
"flutter/build/dart:copy_dart_sdk",
49+
"flutter/lib/snapshot:create_macos_gen_snapshots",
5050
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
5151
"flutter/tools/font_subset",
5252
"flutter:unittests"
@@ -127,8 +127,8 @@
127127
"config": "ci/host_profile",
128128
"targets": [
129129
"flutter/build/dart:copy_dart_sdk",
130-
"flutter/build/archives:archive_gen_snapshot",
131130
"flutter/build/archives:artifacts",
131+
"flutter/lib/snapshot:create_macos_gen_snapshots",
132132
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
133133
"flutter:unittests"
134134
]
@@ -214,9 +214,9 @@
214214
"ninja": {
215215
"config": "ci/host_release",
216216
"targets": [
217-
"flutter/build/archives:archive_gen_snapshot",
218217
"flutter/build/archives:artifacts",
219218
"flutter/build/dart:copy_dart_sdk",
219+
"flutter/lib/snapshot:create_macos_gen_snapshots",
220220
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
221221
"flutter/tools/font_subset",
222222
"flutter:unittests"
@@ -298,10 +298,10 @@
298298
"config": "ci/mac_debug_arm64",
299299
"targets": [
300300
"flutter/tools/font_subset",
301-
"flutter/build/archives:archive_gen_snapshot",
302301
"flutter/build/archives:artifacts",
303302
"flutter/build/archives:dart_sdk_archive",
304303
"flutter/build/archives:flutter_embedder_framework",
304+
"flutter/lib/snapshot:create_macos_gen_snapshots",
305305
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
306306
]
307307
},
@@ -368,6 +368,7 @@
368368
"config": "ci/mac_profile_arm64",
369369
"targets": [
370370
"flutter/build/archives:artifacts",
371+
"flutter/lib/snapshot:create_macos_gen_snapshots",
371372
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
372373
]
373374
},
@@ -442,10 +443,10 @@
442443
"config": "ci/mac_release_arm64",
443444
"targets": [
444445
"flutter:unittests",
445-
"flutter/build/archives:archive_gen_snapshot",
446446
"flutter/build/archives:artifacts",
447447
"flutter/build/dart:copy_dart_sdk",
448448
"flutter/impeller/golden_tests:impeller_golden_tests",
449+
"flutter/lib/snapshot:create_macos_gen_snapshots",
449450
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
450451
"flutter/tools/font_subset"
451452
]
@@ -557,10 +558,10 @@
557558
"parameters": [
558559
"--dst",
559560
"out/debug/snapshot",
560-
"--arm64-out-dir",
561-
"out/ci/mac_debug_arm64",
562-
"--x64-out-dir",
563-
"out/ci/host_debug",
561+
"--arm64-path",
562+
"out/ci/mac_debug_arm64/gen_snapshot_arm64",
563+
"--x64-path",
564+
"out/ci/host_debug/gen_snapshot_x64",
564565
"--zip"
565566
],
566567
"script": "flutter/sky/tools/create_macos_gen_snapshots.py"
@@ -570,10 +571,10 @@
570571
"parameters": [
571572
"--dst",
572573
"out/profile/snapshot",
573-
"--arm64-out-dir",
574-
"out/ci/mac_profile_arm64",
575-
"--x64-out-dir",
576-
"out/ci/host_profile",
574+
"--arm64-path",
575+
"out/ci/mac_profile_arm64/gen_snapshot_arm64",
576+
"--x64-path",
577+
"out/ci/host_profile/gen_snapshot_x64",
577578
"--zip"
578579
],
579580
"script": "flutter/sky/tools/create_macos_gen_snapshots.py"
@@ -583,10 +584,10 @@
583584
"parameters": [
584585
"--dst",
585586
"out/release/snapshot",
586-
"--arm64-out-dir",
587-
"out/ci/mac_release_arm64",
588-
"--x64-out-dir",
589-
"out/ci/host_release",
587+
"--arm64-path",
588+
"out/ci/mac_release_arm64/gen_snapshot_arm64",
589+
"--x64-path",
590+
"out/ci/host_release/gen_snapshot_x64",
590591
"--zip"
591592
],
592593
"script": "flutter/sky/tools/create_macos_gen_snapshots.py"

‎ci/builders/mac_ios_engine.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,8 @@
519519
"parameters": [
520520
"--dst",
521521
"out/release",
522-
"--arm64-out-dir",
523-
"out/ci/ios_release"
522+
"--arm64-path",
523+
"out/ci/ios_release/clang_x64/gen_snapshot"
524524
],
525525
"script": "flutter/sky/tools/create_macos_gen_snapshots.py",
526526
"language": "python3"

‎ci/licenses_golden/excluded_files‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
../../../flutter/.ci.yaml
1313
../../../flutter/.clang-format
1414
../../../flutter/.clang-tidy
15+
../../../flutter/.dart_tool
1516
../../../flutter/.git
1617
../../../flutter/.gitattributes
1718
../../../flutter/.github
@@ -140,6 +141,7 @@
140141
../../../flutter/impeller/compiler/switches_unittests.cc
141142
../../../flutter/impeller/core/allocator_unittests.cc
142143
../../../flutter/impeller/display_list/aiks_dl_atlas_unittests.cc
144+
../../../flutter/impeller/display_list/aiks_dl_basic_unittests.cc
143145
../../../flutter/impeller/display_list/aiks_dl_clip_unittests.cc
144146
../../../flutter/impeller/display_list/aiks_dl_gradient_unittests.cc
145147
../../../flutter/impeller/display_list/aiks_dl_opacity_unittests.cc
@@ -253,6 +255,8 @@
253255
../../../flutter/lib/web_ui/pubspec.yaml
254256
../../../flutter/lib/web_ui/test
255257
../../../flutter/prebuilts
258+
../../../flutter/pubspec.lock
259+
../../../flutter/pubspec.yaml
256260
../../../flutter/runtime/dart_isolate_unittests.cc
257261
../../../flutter/runtime/dart_lifecycle_unittests.cc
258262
../../../flutter/runtime/dart_plugin_registrant_unittests.cc
@@ -1426,6 +1430,7 @@
14261430
../../../flutter/third_party/dart/runtime/tools/dartfuzz/update_spreadsheet.py
14271431
../../../flutter/third_party/dart/runtime/tools/embedder_layering_check.py
14281432
../../../flutter/third_party/dart/runtime/tools/entitlements/README.md
1433+
../../../flutter/third_party/dart/runtime/tools/exists.py
14291434
../../../flutter/third_party/dart/runtime/tools/gen_library_src_paths.py
14301435
../../../flutter/third_party/dart/runtime/tools/graphexplorer/graphexplorer.css
14311436
../../../flutter/third_party/dart/runtime/tools/heapsnapshot/CHANGELOG.md
@@ -3415,9 +3420,6 @@
34153420
../../../fuchsia/sdk/linux/fidl/fuchsia.wlan.softmac/meta.json
34163421
../../../fuchsia/sdk/linux/fidl/zx/meta.json
34173422
../../../fuchsia/sdk/linux/meta
3418-
../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/dist/lib/asan/ld.so.1
3419-
../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/dist/lib/hwasan/ld.so.1
3420-
../../../fuchsia/sdk/linux/obj/arm64-api-15/sysroot/dist/lib/ld.so.1
34213423
../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/dist/lib/asan/ld.so.1
34223424
../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/dist/lib/hwasan/ld.so.1
34233425
../../../fuchsia/sdk/linux/obj/arm64-api-16/sysroot/dist/lib/ld.so.1
@@ -3436,8 +3438,6 @@
34363438
../../../fuchsia/sdk/linux/obj/arm64-api-21/sysroot/dist/lib/asan/ld.so.1
34373439
../../../fuchsia/sdk/linux/obj/arm64-api-21/sysroot/dist/lib/hwasan/ld.so.1
34383440
../../../fuchsia/sdk/linux/obj/arm64-api-21/sysroot/dist/lib/ld.so.1
3439-
../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/dist/lib/asan/ld.so.1
3440-
../../../fuchsia/sdk/linux/obj/riscv64-api-15/sysroot/dist/lib/ld.so.1
34413441
../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/dist/lib/asan/ld.so.1
34423442
../../../fuchsia/sdk/linux/obj/riscv64-api-16/sysroot/dist/lib/ld.so.1
34433443
../../../fuchsia/sdk/linux/obj/riscv64-api-17/sysroot/dist/lib/asan/ld.so.1
@@ -3450,8 +3450,6 @@
34503450
../../../fuchsia/sdk/linux/obj/riscv64-api-20/sysroot/dist/lib/ld.so.1
34513451
../../../fuchsia/sdk/linux/obj/riscv64-api-21/sysroot/dist/lib/asan/ld.so.1
34523452
../../../fuchsia/sdk/linux/obj/riscv64-api-21/sysroot/dist/lib/ld.so.1
3453-
../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/dist/lib/asan/ld.so.1
3454-
../../../fuchsia/sdk/linux/obj/x64-api-15/sysroot/dist/lib/ld.so.1
34553453
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/asan/ld.so.1
34563454
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/ld.so.1
34573455
../../../fuchsia/sdk/linux/obj/x64-api-17/sysroot/dist/lib/asan/ld.so.1

0 commit comments

Comments
 (0)