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

Commit 498ffd8

Browse files
committed
Merge remote-tracking branch 'origin/main' into internalize-rasterizer-discarding
2 parents a9bf24e + c5cf722 commit 498ffd8

File tree

156 files changed

+3748
-2966
lines changed

Some content is hidden

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

156 files changed

+3748
-2966
lines changed

.ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ targets:
210210

211211
- name: Linux linux_clang_tidy
212212
recipe: engine_v2/engine_v2
213+
presubmit: false
213214
timeout: 120
214215
properties:
215216
config_name: linux_clang_tidy
@@ -227,7 +228,6 @@ targets:
227228
- "**.vert"
228229

229230
- name: Linux linux_clang_tidy_presubmit
230-
bringup: true
231231
recipe: engine_v2/engine_v2
232232
timeout: 120
233233
properties:
@@ -361,6 +361,7 @@ targets:
361361

362362
- name: Mac mac_clang_tidy
363363
recipe: engine_v2/engine_v2
364+
presubmit: false
364365
timeout: 120
365366
properties:
366367
config_name: mac_clang_tidy
@@ -380,7 +381,6 @@ targets:
380381
- "**.mm"
381382

382383
- name: Mac mac_clang_tidy_presubmit
383-
bringup: true
384384
recipe: engine_v2/engine_v2
385385
timeout: 120
386386
properties:

DEPS

Lines changed: 14 additions & 14 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': '1bec2899ace82f8561a7f4958505a1cc0e1a7393',
21+
'skia_revision': 'aa208c8a2d60b087ef74d35737b037cfe85a4fc4',
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.
@@ -53,7 +53,7 @@ vars = {
5353
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5454
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5555
# updated revision list of existing dependencies.
56-
'dart_revision': '7e4e5796ee998e35757d0c0db0b2d08d2040ab4c',
56+
'dart_revision': 'ab417bc74bb1a81acbb3b981d440d4bfe68f5051',
5757

5858
# WARNING: DO NOT EDIT MANUALLY
5959
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -62,17 +62,17 @@ vars = {
6262
'dart_boringssl_rev': '74646566e93de7551bfdfc5f49de7462f13d1d05',
6363
'dart_browser_launcher_rev': '27ec600af41b0d0ebe9a3db6ad36e9ed11976b84',
6464
'dart_clock_rev': '263e508a36ed90e4d85b60dd70552d20e71a9ae9',
65-
'dart_collection_rev': '1ed009ea55434f58747209458a21faf8693fc6f7',
66-
'dart_devtools_rev': '6f42c1d59d95dcacde130f2910c1d10be8508e61',
65+
'dart_collection_rev': '1a9b7eb64be10a8ba4ced7eb36b4b265a49d5d41',
66+
'dart_devtools_rev': '79b5094a0ba523633f69276aa566e53d98c3a067',
6767
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
6868
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
6969
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
70-
'dart_protobuf_rev': 'a852ba4e4b6f319c655fc938864dac8442b7c4ad',
70+
'dart_protobuf_rev': '5e8f36b48f015532cd1165b47686b659fc8870da',
7171
'dart_pub_rev': '42819a1e10f803eb7f6296692c5a976e1c647360',
7272
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
73-
'dart_tools_rev': '295ff92dbbb756bf9cc545f1b642cffd5988a079',
73+
'dart_tools_rev': '2be6c2ede4fec9455f6135878c1d63ed732f4749',
7474
'dart_watcher_rev': '7457413060ed7403b90b01533a61bd959932122e',
75-
'dart_webdev_rev': '19aad27b2dd0c713d0a477eeeac2bef10ecbf125',
75+
'dart_webdev_rev': 'fc876cb0de59526160ed17efaa920557a6e2ba32',
7676
'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6',
7777
'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce',
7878
'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -332,7 +332,7 @@ deps = {
332332
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@cdb7aeab40b4c522de20b242019f7e88641445d5',
333333

334334
'src/third_party/dart/third_party/devtools':
335-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:6f42c1d59d95dcacde130f2910c1d10be8508e61'}]},
335+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:79b5094a0ba523633f69276aa566e53d98c3a067'}]},
336336

337337
'src/third_party/dart/third_party/pkg/args':
338338
Var('dart_git') + '/args.git@da56b18ebcb600e050bf57b9c1103b1d2a9fb2ff',
@@ -371,7 +371,7 @@ deps = {
371371
Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
372372

373373
'src/third_party/dart/third_party/pkg/dartdoc':
374-
Var('dart_git') + '/dartdoc.git@5cfb1f366f5790dcf531edd528850001b8e2a75c',
374+
Var('dart_git') + '/dartdoc.git@e14837350492494bc693d69d29b9e21f50c224d0',
375375

376376
'src/third_party/dart/third_party/pkg/ffi':
377377
Var('dart_git') + '/ffi.git@e2c01a960b84d1074b0a1849909ae2d269d004be',
@@ -389,7 +389,7 @@ deps = {
389389
Var('dart_git') + '/html.git@4060496b0443451c38f8b789db2e44c0d7966171',
390390

391391
'src/third_party/dart/third_party/pkg/http':
392-
Var('dart_git') + '/http.git@9f167a72012503a0679c7004a037508304ee8bfc',
392+
Var('dart_git') + '/http.git@631d4ec1bcea311a4208b4e5e06031f0307ac9f0',
393393

394394
'src/third_party/dart/third_party/pkg/http_multi_server':
395395
Var('dart_git') + '/http_multi_server.git@aa128cfaf6ef1c9c1ace962ca2dcf6e5dddad441',
@@ -422,7 +422,7 @@ deps = {
422422
Var('dart_git') + '/mime.git@799b398140817fdb134f639d84e91c552e129136',
423423

424424
'src/third_party/dart/third_party/pkg/mockito':
425-
Var('dart_git') + '/mockito.git@ff79de69e9ef9e8647bd6008c29c16651c9ac220',
425+
Var('dart_git') + '/mockito.git@e54a00667cbe9a27de08e4c0ea355bacbe8c98d0',
426426

427427
'src/third_party/dart/third_party/pkg/native':
428428
Var('dart_git') + '/native.git@5a1361b6d98a84f8070c97872e3d3587fc0ba435',
@@ -473,7 +473,7 @@ deps = {
473473
Var('dart_git') + '/term_glyph.git@423700a3c019dc67f93d2bd6578016a1402506f7',
474474

475475
'src/third_party/dart/third_party/pkg/test':
476-
Var('dart_git') + '/test.git@bc0a992dd84f8d3f52cd04b6bfa9f466ca172272',
476+
Var('dart_git') + '/test.git@d0fc4bde2e05e62c75bc3ac7b3de3f510816ea44',
477477

478478
'src/third_party/dart/third_party/pkg/test_reflective_loader':
479479
Var('dart_git') + '/test_reflective_loader.git@0bfaad91ed308ce9da11b48395c8210d7542c16b',
@@ -884,7 +884,7 @@ deps = {
884884
'packages': [
885885
{
886886
'package': 'fuchsia/sdk/core/mac-amd64',
887-
'version': 'Tnp43n_nAR2N0l_gYiE0YBpA4loAnzR2Zp_vGd3v_IMC'
887+
'version': 'G25oJMO5jbUi-UN4FM1owc2acv-i0u7MdKqblmI-czMC'
888888
}
889889
],
890890
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -894,7 +894,7 @@ deps = {
894894
'packages': [
895895
{
896896
'package': 'fuchsia/sdk/core/linux-amd64',
897-
'version': '7xOzci7fempFgHNk9DxPxpBKoI2onNU4Ye8ElQaNa_QC'
897+
'version': 'kKI09su99b0AKs8b3VKTzXDVmeTaKm7ye2chxl9BE0EC'
898898
}
899899
],
900900
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

0 commit comments

Comments
 (0)