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

Commit

Permalink
Merge branch 'main' of github.com:flutter/engine into big_migration_1…
Browse files Browse the repository at this point in the history
…23456
  • Loading branch information
jonahwilliams committed Jul 10, 2024
2 parents 5961534 + b369582 commit 4fce66e
Show file tree
Hide file tree
Showing 33 changed files with 714 additions and 194 deletions.
50 changes: 25 additions & 25 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {
'flutter_git': 'https://flutter.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
'llvm_git': 'https://llvm.googlesource.com',
'skia_revision': '46e5bf98158a789ebef44b9ca39ad35f02d2fd8b',
'skia_revision': '2783ba54bf8e10b9ae311ec4927c37a053ff422c',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -56,7 +56,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': 'ffc8bb004a64f6357e3d5d1185e974e966f00931',
'dart_revision': 'c6053ad84f2bc2182834421e0f81f1295677ba06',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand All @@ -65,8 +65,8 @@ vars = {
'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
'dart_collection_rev': '9354f386de3c57f5486b01ab4dfa1a2f033307d9',
'dart_devtools_rev': '70375f6c6d81faa8f3069aa6dcf2a98c69445455',
'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
Expand All @@ -77,7 +77,7 @@ vars = {
'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
'dart_yaml_edit_rev': '57a28daea82a3f00f57a90d5ea6df6a458b2f781',
'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',

'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1

Expand Down Expand Up @@ -277,7 +277,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c2d66fa4e6298894425f5bdd0591bc5b1154c53',
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e265c359126b24351f534080fb22edaa159f2215',

'src/flutter/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
Expand Down Expand Up @@ -347,16 +347,16 @@ deps = {
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@654ee6e2504f11fb0e982a2cf276bafa750f694b',

'src/flutter/third_party/dart/third_party/devtools':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:70375f6c6d81faa8f3069aa6dcf2a98c69445455'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:e77d6ce142b7bc737af3652f5727e449e84b7b03'}]},

'src/flutter/third_party/dart/third_party/pkg/args':
Var('dart_git') + '/args.git@6a5a2e6b1f0020b873c7ffbdd36a784c4f9ee300',
Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',

'src/flutter/third_party/dart/third_party/pkg/async':
Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',

'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
Var('dart_git') + '/bazel_worker.git@c76d7c86381a6ed594641ba03b55c65b84ee11a6',
Var('dart_git') + '/bazel_worker.git@02f190b88df771fc8e05c07d4b64ae942c02f456',

'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
Var('dart_git') + '/boolean_selector.git@c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261',
Expand Down Expand Up @@ -386,40 +386,40 @@ deps = {
Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',

'src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@7e5da6090e6a48cebaee8789ca0fc396b34fd8a4',
Var('dart_git') + '/dartdoc.git@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',

'src/flutter/third_party/dart/third_party/pkg/file':
Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',

'src/flutter/third_party/dart/third_party/pkg/fixnum':
Var('dart_git') + '/fixnum.git@6c19e60366ce3d5edfaed51a7c12c98e7977977e',

'src/flutter/third_party/dart/third_party/pkg/glob':
Var('dart_git') + '/glob.git@6d3ba5ec02817e62d17ace040590bb81a3e1242f',
Var('dart_git') + '/glob.git@8b05be87f84f74d90dc0c15956f3ff95805322e5',

'src/flutter/third_party/dart/third_party/pkg/html':
Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',

'src/flutter/third_party/dart/third_party/pkg/http':
Var('dart_git') + '/http.git@8d893851904d8cd292a66e39812b59aca2cc4d96',
Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',

'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',

'src/flutter/third_party/dart/third_party/pkg/http_parser':
Var('dart_git') + '/http_parser.git@9bf7bd981a39137da1e5d7fe64f4652b078c7aa9',
Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',

'src/flutter/third_party/dart/third_party/pkg/intl':
Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',

'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
Var('dart_git') + '/json_rpc_2.git@616937f6d3837e38a2a287653ddaf722de260702',
Var('dart_git') + '/json_rpc_2.git@b4810dc7bee5828f240586c81f3f34853cacdbce',

'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',

'src/flutter/third_party/dart/third_party/pkg/logging':
Var('dart_git') + '/logging.git@6c3fb37fecb2e30415072f327b834a3e95517fa9',
Var('dart_git') + '/logging.git@8752902b75a476d2c7b64dcf01aaaee885f35c4c',

'src/flutter/third_party/dart/third_party/pkg/markdown':
Var('dart_git') + '/markdown.git@62424376d0b5fe35a2957b3caed4b75db010ba82',
Expand All @@ -431,13 +431,13 @@ deps = {
Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',

'src/flutter/third_party/dart/third_party/pkg/mockito':
Var('dart_git') + '/mockito.git@a7fdf7101fbd31132a59188a6057d21004345927',
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',

'src/flutter/third_party/dart/third_party/pkg/native':
Var('dart_git') + '/native.git@fcc783c1d2777555616dfc850f131878ea5d88a9',
Var('dart_git') + '/native.git@bc0a10865b5b7b0c5444581b77728fc20bffedb8',

'src/flutter/third_party/dart/third_party/pkg/package_config':
Var('dart_git') + '/package_config.git@903a0e528f91aef90821c8f5eaafbc1ae27198ab',
Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',

'src/flutter/third_party/dart/third_party/pkg/path':
Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',
Expand All @@ -461,10 +461,10 @@ deps = {
Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',

'src/flutter/third_party/dart/third_party/pkg/source_maps':
Var('dart_git') + '/source_maps.git@caa79c2011015759c6cf3299f299f5cccdf8bb61',
Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',

'src/flutter/third_party/dart/third_party/pkg/source_span':
Var('dart_git') + '/source_span.git@89520f3009e332ce2b6675f71dca166521c36cc4',
Var('dart_git') + '/source_span.git@f81cd4a2df630a97264fb4015fb93944b5b98b11',

'src/flutter/third_party/dart/third_party/pkg/sse':
Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
Expand All @@ -476,7 +476,7 @@ deps = {
Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',

'src/flutter/third_party/dart/third_party/pkg/string_scanner':
Var('dart_git') + '/string_scanner.git@0de03b5279a04aa05052ce306f90fca473c6fd1a',
Var('dart_git') + '/string_scanner.git@a40bbbd83f1176bcc0021b336f5841310f91d8cb',

'src/flutter/third_party/dart/third_party/pkg/tar':
Var('dart_git') + '/external/github.com/simolus3/tar.git@552a49d7595e444184d4f91e9afd533aa253a31d',
Expand All @@ -485,7 +485,7 @@ deps = {
Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',

'src/flutter/third_party/dart/third_party/pkg/test':
Var('dart_git') + '/test.git@3256c23cc753a184bb3bf27610a7c8410735e3ac',
Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',

'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
Expand Down Expand Up @@ -518,7 +518,7 @@ deps = {
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),

'src/flutter/third_party/dart/tools/sdks/dart-sdk':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.5.0-278.0.dev'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:7e6469bd51d404916395a47b011d907d2c905121'}]},

# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.

Expand Down
12 changes: 10 additions & 2 deletions ci/licenses_golden/licenses_dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 987cab3f3e3a6e4e7248b7606f819b61
Signature: b45ed5020c7ec33466cb700a0c21051d

====================================================================================================
LIBRARY: dart
Expand Down Expand Up @@ -4086,8 +4086,12 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calli
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.cc + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.h + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/os.cc + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_set.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_set.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_set.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/array_flags.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart + ../../../flutter/third_party/dart/LICENSE
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart + ../../../flutter/third_party/dart/LICENSE
Expand All @@ -4106,8 +4110,12 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calling
FILE: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.cc
FILE: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.h
FILE: ../../../flutter/third_party/dart/runtime/vm/os.cc
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_set.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_set.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_set.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/array_flags.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart
Expand Down Expand Up @@ -4751,7 +4759,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.

You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/ffc8bb004a64f6357e3d5d1185e974e966f00931
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/c6053ad84f2bc2182834421e0f81f1295677ba06
/third_party/fallback_root_certificates/

====================================================================================================
Expand Down
4 changes: 4 additions & 0 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -42618,6 +42618,7 @@ ORIGIN: ../../../flutter/lib/ui/experiments/setup_hooks.dart + ../../../flutter/
ORIGIN: ../../../flutter/lib/ui/experiments/ui.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/floating_point.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/geometry.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/hash_codes.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/hooks.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/io_manager.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/ui/io_manager.h + ../../../flutter/LICENSE
Expand Down Expand Up @@ -42780,6 +42781,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/canvas.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/channel_buffers.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/compositing.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/geometry.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/hash_codes.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/initialization.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/key.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/lerp.dart + ../../../flutter/LICENSE
Expand Down Expand Up @@ -45490,6 +45492,7 @@ FILE: ../../../flutter/lib/ui/experiments/setup_hooks.dart
FILE: ../../../flutter/lib/ui/experiments/ui.dart
FILE: ../../../flutter/lib/ui/floating_point.h
FILE: ../../../flutter/lib/ui/geometry.dart
FILE: ../../../flutter/lib/ui/hash_codes.dart
FILE: ../../../flutter/lib/ui/hooks.dart
FILE: ../../../flutter/lib/ui/io_manager.cc
FILE: ../../../flutter/lib/ui/io_manager.h
Expand Down Expand Up @@ -45653,6 +45656,7 @@ FILE: ../../../flutter/lib/web_ui/lib/canvas.dart
FILE: ../../../flutter/lib/web_ui/lib/channel_buffers.dart
FILE: ../../../flutter/lib/web_ui/lib/compositing.dart
FILE: ../../../flutter/lib/web_ui/lib/geometry.dart
FILE: ../../../flutter/lib/web_ui/lib/hash_codes.dart
FILE: ../../../flutter/lib/web_ui/lib/initialization.dart
FILE: ../../../flutter/lib/web_ui/lib/key.dart
FILE: ../../../flutter/lib/web_ui/lib/lerp.dart
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 42ad66818a108e69dc749f6dae8139b0
Signature: ba0473277ecf2802a682ceeee0e40eaa

====================================================================================================
LIBRARY: etc1
Expand Down
4 changes: 2 additions & 2 deletions impeller/docs/opengles_development_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you are visually verifying a subset of tests quickly, you can specify how lon
--playground_timeout_ms=1000
```

> ![TIP]
> [!TIP]
> To render one and only frame of each playground, specify the a timeout of 0 milliseconds.
### Selecting a Subset of Tests to Run
Expand Down Expand Up @@ -68,7 +68,7 @@ Setup Xcode for frame captures with Playgrounds [using the documented instructio

We are going to use Angle to translate OpenGL ES calls into Metal calls and then debug/profile the results. You can switch backends by tinkering with the filters as command line arguments in Xcode run scheme.

> ![TIP]
> [!TIP]
> You'll be editing the Xcode run scheme a lot as you switch backends and tests. The shortcut to edit the scheme is `⌘ + ⇧ + r`.
An alternative on non-macOS platforms is RenderDoc. Instructions to [setup RenderDoc are here](./renderdoc_frame_capture.md). RenderDoc is **not** available on macOS.
Expand Down
1 change: 1 addition & 0 deletions lib/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ if (enable_unittests) {
"fixtures/hello_loop_2.gif",
"fixtures/hello_loop_2.webp",
"fixtures/FontManifest.json",
"fixtures/unmultiplied_alpha.png",
"fixtures/WideGamutIndexed.png",
"//flutter/third_party/txt/third_party/fonts/Roboto-Medium.ttf",
]
Expand Down
1 change: 1 addition & 0 deletions lib/ui/dart_ui.gni
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dart_ui_files = [
"//flutter/lib/ui/channel_buffers.dart",
"//flutter/lib/ui/compositing.dart",
"//flutter/lib/ui/geometry.dart",
"//flutter/lib/ui/hash_codes.dart",
"//flutter/lib/ui/hooks.dart",
"//flutter/lib/ui/isolate_name_server.dart",
"//flutter/lib/ui/key.dart",
Expand Down
4 changes: 3 additions & 1 deletion lib/ui/experiments/ui.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ part '../annotations.dart';
part '../channel_buffers.dart';
part '../compositing.dart';
part '../geometry.dart';
part '../hash_codes.dart';
part '../hooks.dart';
part '../isolate_name_server.dart';
part '../key.dart';
Expand All @@ -44,7 +45,8 @@ part '../platform_isolate.dart';
part '../plugins.dart';
part '../pointer.dart';
part '../semantics.dart';
part 'setup_hooks.dart';
part '../text.dart';
part '../window.dart';

part 'scene.dart';
part 'setup_hooks.dart';
Binary file added lib/ui/fixtures/unmultiplied_alpha.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4fce66e

Please sign in to comment.