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

Commit 9d8e51a

Browse files
authored
Merge branch 'flutter:main' into colorFilter-as-imageFilter
2 parents 340c791 + 9f000a1 commit 9d8e51a

File tree

68 files changed

+996
-392
lines changed

Some content is hidden

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

68 files changed

+996
-392
lines changed

DEPS

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': '1a7879e4e26a24016903cf4ca974a8f7be2ca3c2',
21+
'skia_revision': '02e2101a75f707c6a5e3f1133c3b8bf7012da5ab',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,23 +48,23 @@ vars = {
4848
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
4949
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5050
# updated revision list of existing dependencies.
51-
'dart_revision': '2b6909ba35e59d2c7efd0ac2d0b9918f9263a039',
51+
'dart_revision': '8132f04a0b86c0be7acb3156d91520888cf01471',
5252

5353
# WARNING: DO NOT EDIT MANUALLY
5454
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
5555
'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
5656
'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
5757
'dart_browser_launcher_rev': '5fa0bd6cddc33785f43c920576fc03dcee1c3caa',
58-
'dart_clock_rev': '97026d1657566bb0c9f5a33642712ec350e45084',
58+
'dart_clock_rev': '8a8231fa7912d84c7e99236b7800cfbef5ea7ae5',
5959
'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
6060
'dart_devtools_rev': '23444af89d716818f099974df3e4fffac87fd886',
61-
'dart_protobuf_rev': 'ba29983968de5b54196c6c2a5cff1afbdda24ae2',
62-
'dart_pub_rev': '65c7f3e528f3f9978c4330cbd471070f17370f65',
61+
'dart_protobuf_rev': '4af1cb3c4e116d02d3b3d005fd9d4995fbc4c564',
62+
'dart_pub_rev': '6ac42d7644dedfcc500147ab47886eecab4b1b38',
6363
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
6464
'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
65-
'dart_webdev_rev': '47c1c3317da20dc2cfb542aeafcd04a0f1f381f1',
65+
'dart_webdev_rev': '22f6271c4ae362d7d13cfe14442aecb197140436',
6666
'dart_webkit_inspection_protocol_rev': 'b825c8f6a12200d619729903207ac826cce278da',
67-
'dart_yaml_edit_rev': '01589b3ce447b03aed991db49f1ec6445ad5476d',
67+
'dart_yaml_edit_rev': '299f74594ff9fda412c1da5c0b5d5231d0c6fc42',
6868
'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
6969

7070
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -151,7 +151,7 @@ deps = {
151151
Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
152152

153153
'src/third_party/icu':
154-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '20f8ac695af59b6c830def7d4e95bfeb13dd7be5',
154+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'da07448619763d1cde255b361324242646f5b268',
155155

156156
'src/third_party/khronos':
157157
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '676d544d2b8f48903b7da9fceffaa534a5613978',
@@ -183,16 +183,16 @@ deps = {
183183
{'packages': [{'version': 'git_revision:23444af89d716818f099974df3e4fffac87fd886', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
184184

185185
'src/third_party/dart/third_party/pkg/args':
186-
Var('dart_git') + '/args.git@aaf671c1462108d62b1dba0e4a74f98ed233d939',
186+
Var('dart_git') + '/args.git@da037acc018a8dd267d109eb634454490b7ff759',
187187

188188
'src/third_party/dart/third_party/pkg/async':
189-
Var('dart_git') + '/async.git@18a780efd914c3d848ddc1af5f6c83903a8b2d2d',
189+
Var('dart_git') + '/async.git@c59c7c51cc2a1b1fc49a2d853d413bd3a92126e9',
190190

191191
'src/third_party/dart/third_party/pkg/bazel_worker':
192-
Var('dart_git') + '/bazel_worker.git@03717ca4c2bbf1d74f26c89673426e076288242a',
192+
Var('dart_git') + '/bazel_worker.git@9f21e1de12d1f7e7450e70b314c81631526c22d0',
193193

194194
'src/third_party/dart/third_party/pkg/boolean_selector':
195-
Var('dart_git') + '/boolean_selector.git@ea0ad2775cc682078571997f6c0512c384ac30f0',
195+
Var('dart_git') + '/boolean_selector.git@5082b3debf97421c071be957063763d98412b2e2',
196196

197197
'src/third_party/dart/third_party/pkg/browser_launcher':
198198
Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
@@ -210,7 +210,7 @@ deps = {
210210
Var('dart_git') + '/convert.git@4feeb10d2f26d22eab461469da0739a57d001edf',
211211

212212
'src/third_party/dart/third_party/pkg/crypto':
213-
Var('dart_git') + '/crypto.git@e175a95619ce23bfbd2ab34a4066f86aa0c108db',
213+
Var('dart_git') + '/crypto.git@bf0c33b42eb7e5991ee98429318884695e576c2b',
214214

215215
'src/third_party/dart/third_party/pkg/csslib':
216216
Var('dart_git') + '/csslib.git@ba2eb2d80530eedefadaade338a09c2dd60410f3',
@@ -219,34 +219,34 @@ deps = {
219219
Var('dart_git') + '/dart_style.git@f79a9828ad07e50d6e8352ac154cc16eb4d78d5c',
220220

221221
'src/third_party/dart/third_party/pkg/dartdoc':
222-
Var('dart_git') + '/dartdoc.git@4b2e01b6e8c7c4e5e365026c182006b9616ecc28',
222+
Var('dart_git') + '/dartdoc.git@08e309818acb44ba3dd46ed999bf6b0359c356ff',
223223

224224
'src/third_party/dart/third_party/pkg/ffi':
225-
Var('dart_git') + '/ffi.git@fb5f2667826c0900e551d19101052f84e35f41bf',
225+
Var('dart_git') + '/ffi.git@3ede2312dd6ec37db6e7bcd6e1236647f72c7fc0',
226226

227227
'src/third_party/dart/third_party/pkg/file':
228228
Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',
229229

230230
'src/third_party/dart/third_party/pkg/fixnum':
231-
Var('dart_git') + '/fixnum.git@e0b17cc1f639c55a9c24947392c64b5a68992535',
231+
Var('dart_git') + '/fixnum.git@bca3816daf641397f7b5ab9cf865a6d10d30c625',
232232

233233
'src/third_party/dart/third_party/pkg/glob':
234234
Var('dart_git') + '/glob.git@7f97bf5be6bfe8c90a92283e4c590dba2a676083',
235235

236236
'src/third_party/dart/third_party/pkg/html':
237-
Var('dart_git') + '/html.git@0bf601959ac98e6cdf1925a1cdab70bd6a5ddc45',
237+
Var('dart_git') + '/html.git@28fb8b97acf471bedcfa4eaf38899a0f65d5e30d',
238238

239239
'src/third_party/dart/third_party/pkg/http':
240240
Var('dart_git') + '/http.git@63390263e230bbd0aa2dae286fd7a64098e09029',
241241

242242
'src/third_party/dart/third_party/pkg/http_multi_server':
243-
Var('dart_git') + '/http_multi_server.git@20bf079c8955d1250a45afb9cb096472a724a551',
243+
Var('dart_git') + '/http_multi_server.git@e31c6988e3869fb4019429254604066338f86095',
244244

245245
'src/third_party/dart/third_party/pkg/http_parser':
246246
Var('dart_git') + '/http_parser.git@c73967535ce31120e218120f70ef98cc22688c82',
247247

248248
'src/third_party/dart/third_party/pkg/json_rpc_2':
249-
Var('dart_git') + '/json_rpc_2.git@805e6536dd961d66f6b8cd46d8f3e61774f957c9',
249+
Var('dart_git') + '/json_rpc_2.git@16fed53fbebd38edf170f58c1da1de2a325b2b98',
250250

251251
'src/third_party/dart/third_party/pkg/linter':
252252
Var('dart_git') + '/linter.git@8bce8b8b06c22716219207eb9d52beb93932ea44',
@@ -255,7 +255,7 @@ deps = {
255255
Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
256256

257257
'src/third_party/dart/third_party/pkg/markdown':
258-
Var('dart_git') + '/markdown.git@9ff4a9f1d37c763f827084ba28a3d0bfec6b5d67',
258+
Var('dart_git') + '/markdown.git@a70b93a1a004cc1da04a3e3ea59821ef8391e0d6',
259259

260260
'src/third_party/dart/third_party/pkg/matcher':
261261
Var('dart_git') + '/matcher.git@6a9b83bbd73e50df2058b3e8e4aa301df49569c6',
@@ -264,19 +264,16 @@ deps = {
264264
Var('dart_git') + '/mime.git@d80f4d09067af87d84d9cb647acfa4d2d313d795',
265265

266266
'src/third_party/dart/third_party/pkg/mockito':
267-
Var('dart_git') + '/mockito.git@094d07cdceca1f9f4ef863fb57045295298e8682',
268-
269-
'src/third_party/dart/third_party/pkg/oauth2':
270-
Var('dart_git') + '/oauth2.git@ee5c9b1ef5bfcd282c0637f319155f89634385ed',
267+
Var('dart_git') + '/mockito.git@748e88e4cbf7e3acd1144cd8e3ea4ae87ea8c9c2',
271268

272269
'src/third_party/dart/third_party/pkg/package_config':
273270
Var('dart_git') + '/package_config.git@cff98c90acc457a3b0750f0a7da0e351a35e5d0c',
274271

275272
'src/third_party/dart/third_party/pkg/path':
276-
Var('dart_git') + '/path.git@9955b27b9bb98d87591208e19eb01c51d29fd467',
273+
Var('dart_git') + '/path.git@58ba22c53e40a05c407abb070ec63674b3a38c4d',
277274

278275
'src/third_party/dart/third_party/pkg/pool':
279-
Var('dart_git') + '/pool.git@fa84ddd0e39f45bf3f09dcc5d6b9fbdda7820fef',
276+
Var('dart_git') + '/pool.git@1ea5b031cfda37786d305292cb8104dffb45d9ae',
280277

281278
'src/third_party/dart/third_party/pkg/protobuf':
282279
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -306,7 +303,7 @@ deps = {
306303
Var('dart_git') + '/stack_trace.git@dce00134f6558086e8963e37d0b1ba0830862c01',
307304

308305
'src/third_party/dart/third_party/pkg/stream_channel':
309-
Var('dart_git') + '/stream_channel.git@a5129ca44322a7024074ca38fb98e343dcb638c7',
306+
Var('dart_git') + '/stream_channel.git@914304769d036867b993bd7f9c111145f1ca4ab0',
310307

311308
'src/third_party/dart/third_party/pkg/string_scanner':
312309
Var('dart_git') + '/string_scanner.git@4a5cbc5c1127151ea507cc9da797b829857607e8',
@@ -315,13 +312,13 @@ deps = {
315312
Var('dart_git') + '/term_glyph.git@ec7cf7bb51ebb7d55760a1359f6697690dbc06ba',
316313

317314
'src/third_party/dart/third_party/pkg/test':
318-
Var('dart_git') + '/test.git@f3fb3ab6a6e6068b2daaed95ca13e526238def26',
315+
Var('dart_git') + '/test.git@7756833000d671d4540b37ef04acd4b9e716026f',
319316

320317
'src/third_party/dart/third_party/pkg/test_reflective_loader':
321318
Var('dart_git') + '/test_reflective_loader.git@ef934b7a894d78601ba67d8f6207bd4505690456',
322319

323320
'src/third_party/dart/third_party/pkg/typed_data':
324-
Var('dart_git') + '/typed_data.git@6369490ede1c87a4a5758304a606a6e4eee364b9',
321+
Var('dart_git') + '/typed_data.git@1e838b8ec85699b5b99e793d004ae315e72fcbc0',
325322

326323
'src/third_party/dart/third_party/pkg/usage':
327324
Var('dart_git') + '/usage.git@fee1d9d9c295362f6edebfeebb9f8187711c55ab',
@@ -330,7 +327,7 @@ deps = {
330327
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
331328

332329
'src/third_party/dart/third_party/pkg/web_socket_channel':
333-
Var('dart_git') + '/web_socket_channel.git@eba15419e51836a67fee18d1b7fd1b875d890bc3',
330+
Var('dart_git') + '/web_socket_channel.git@1b0561cfec8ff7e9465896eb340ea3c382b59393',
334331

335332
'src/third_party/dart/third_party/pkg/webdev':
336333
Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -695,7 +692,7 @@ deps = {
695692
'packages': [
696693
{
697694
'package': 'fuchsia/sdk/core/mac-amd64',
698-
'version': 'vEw8iuSZYmlfk1JiEWg8Yb4_sN9PaX30Wdx8TfWyitEC'
695+
'version': '32kfSm94FGtJJeUjggAZ33p6MgnFTefHODyDvtUCJ2kC'
699696
}
700697
],
701698
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -705,7 +702,7 @@ deps = {
705702
'packages': [
706703
{
707704
'package': 'fuchsia/sdk/core/linux-amd64',
708-
'version': 'R3L54Ma3VT2TQ6RpIqeQORplbBnVxmX5enyHsFM2XGUC'
705+
'version': 'agStiOtzmc9Fmw6gcxxgWGUK7xmMq-8EXxSO_D1EocIC'
709706
}
710707
],
711708
'condition': 'host_os == "linux" and not download_fuchsia_sdk',
@@ -724,6 +721,12 @@ hooks = [
724721
'pattern': '.',
725722
'action': ['python3', 'src/third_party/dart/tools/generate_package_config.py'],
726723
},
724+
{
725+
# Generate the sdk/version file.
726+
'name': 'Generate sdk/version',
727+
'pattern': '.',
728+
'action': ['python3', 'src/third_party/dart/tools/generate_sdk_version_file.py'],
729+
},
727730
{
728731
# Update the Windows toolchain if necessary.
729732
'name': 'win_toolchain',

build/archives/BUILD.gn

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,3 +300,16 @@ if (is_mac) {
300300
]
301301
}
302302
}
303+
304+
if (host_os == "win") {
305+
zip_bundle("archive_win_gen_snapshot") {
306+
deps = [ "//flutter:gen_snapshot" ]
307+
output = "$full_target_platform_name-$flutter_runtime_mode/windows-x64.zip"
308+
files = [
309+
{
310+
source = "$root_out_dir/gen_snapshot/gen_snapshot.exe"
311+
destination = "gen_snapshot.exe"
312+
},
313+
]
314+
}
315+
}

ci/licenses_golden/licenses_flutter

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@ FILE: ../../../flutter/impeller/renderer/pipeline_builder.cc
15261526
FILE: ../../../flutter/impeller/renderer/pipeline_builder.h
15271527
FILE: ../../../flutter/impeller/renderer/pipeline_descriptor.cc
15281528
FILE: ../../../flutter/impeller/renderer/pipeline_descriptor.h
1529+
FILE: ../../../flutter/impeller/renderer/pipeline_descriptor_unittests.cc
15291530
FILE: ../../../flutter/impeller/renderer/pipeline_library.cc
15301531
FILE: ../../../flutter/impeller/renderer/pipeline_library.h
15311532
FILE: ../../../flutter/impeller/renderer/platform.cc

ci/licenses_golden/licenses_fuchsia

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: d6ba628118162c72390301872bcad049
1+
Signature: 6bcde682f6facc6b6a14b6486a7b9e28
22

33
UNUSED LICENSES:
44

@@ -245,7 +245,6 @@ FILE: ../../../fuchsia/sdk/linux/pkg/async/include/lib/async/wait.h
245245
FILE: ../../../fuchsia/sdk/linux/pkg/async/ops.c
246246
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/limits.h
247247
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/namespace.h
248-
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/private.h
249248
FILE: ../../../fuchsia/sdk/linux/pkg/fdio/include/lib/fdio/unsafe.h
250249
FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/decoding_and_validating.cc
251250
FILE: ../../../fuchsia/sdk/linux/pkg/fidl_base/encoding.cc
@@ -1092,6 +1091,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
10921091
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
10931092
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
10941093
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
1094+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
10951095
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
10961096
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
10971097
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json
@@ -2060,10 +2060,12 @@ FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/local_compo
20602060
FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_component_test/lib/src/realm_builder.dart
20612061
FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/lib/src/view_creation_token_pair.dart
20622062
FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_view/lib/tokens.dart
2063+
FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/performance_publish.dart
20632064
FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/trace_processing/metrics/power_metrics.dart
20642065
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.accessibility.semantics/overview.fidl
20652066
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/overview.fidl
20662067
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/overview.fidl
2068+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/provider.fidl
20672069
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/overview.fidl
20682070
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/overview.fidl
20692071
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.le/overview.fidl
@@ -2666,6 +2668,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
26662668
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
26672669
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
26682670
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
2671+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
26692672
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
26702673
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
26712674
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json
@@ -3500,6 +3503,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.audio.effects/meta.json
35003503
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth.oldtokens/meta.json
35013504
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.auth/meta.json
35023505
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.a2dp/meta.json
3506+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.fastpair/meta.json
35033507
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt/meta.json
35043508
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.gatt2/meta.json
35053509
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.bluetooth.hfp/meta.json

0 commit comments

Comments
 (0)