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

Commit 459fd32

Browse files
LongCatIsLooongLongCatIsLooong
committed
Merge remote-tracking branch 'upstream/master' into ios-floating-cursor-fix
2 parents b13caac + 6dd3fa4 commit 459fd32

File tree

181 files changed

+5642
-7490
lines changed

Some content is hidden

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

181 files changed

+5642
-7490
lines changed

‎.ci.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ targets:
3838
builder: Linux Host Engine
3939
scheduler: luci
4040

41+
- name: Linux Unopt
42+
builder: Linux Unopt
43+
scheduler: luci
44+
4145
- name: Linux Arm Host Engine
4246
builder: Linux Arm Host Engine
4347
scheduler: luci
@@ -78,6 +82,10 @@ targets:
7882
builder: Mac Host Engine
7983
scheduler: luci
8084

85+
- name: Mac Unopt
86+
builder: Mac Unopt
87+
scheduler: luci
88+
8189
- name: Mac iOS Engine
8290
builder: Mac iOS Engine
8391
scheduler: luci
@@ -102,6 +110,10 @@ targets:
102110
builder: Windows Host Engine
103111
scheduler: luci
104112

113+
- name: Windows Unopt
114+
builder: Windows Unopt
115+
scheduler: luci
116+
105117
- name: Windows UWP Engine
106118
builder: Windows UWP Engine
107119
scheduler: luci

‎DEPS

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,28 @@ 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': '890498e3d73014e81ae15a250e5ed658f1cf11a6',
30+
'skia_revision': '568ef84d3f8a5ade2eae0599fcb1c61bbfdf04da',
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': '069554af24d699c588cfaa2f29ebdc17fb2eb5b0',
38+
'dart_revision': '2e9c4305a6aa0898d706c28284946632685bae91',
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
4242
'dart_boringssl_gen_rev': '7322fc15cc065d8d2957fccce6b62a509dc4d641',
4343
'dart_boringssl_rev': '1607f54fed72c6589d560254626909a64124f091',
4444
'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3',
4545
'dart_collection_rev': '9967dcd3d7645db6de48d5abfab3018bb0c84236',
46-
'dart_devtools_rev': 'e138d55437a59838607415ef21f20bd6c4955dbc',
46+
'dart_devtools_rev': 'b3bf672474a2bff82f33e1176aa803539baa0d60+1',
4747
'dart_http_throttle_tag': '1.0.2',
4848
'dart_intl_tag': '0.17.0-nullsafety',
49-
'dart_linter_tag': '1.4.0',
49+
'dart_linter_tag': '1.5.0',
5050
'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
51-
'dart_pub_rev': 'def32ceb1d660552eaec24839d377199aea5a569',
51+
'dart_pub_rev': '11c2a0978e66fbc2c182dc6a8174db1a3651276c',
5252
'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
5353
'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8',
5454
'dart_shelf_proxy_tag': 'v1.0.0',
@@ -98,7 +98,7 @@ allowed_hosts = [
9898
]
9999

100100
deps = {
101-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ff1975def53bfdaa1ff3f4b0cceabf54e1323392',
101+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '91b3d1f3a878a6d6ce0749a233d5d467c4daaf41',
102102

103103
# Fuchsia compatibility
104104
#
@@ -153,7 +153,7 @@ deps = {
153153
# WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
154154

155155
'src/third_party/dart/third_party/devtools':
156-
{'packages': [{'version': 'git_revision:e138d55437a59838607415ef21f20bd6c4955dbc', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
156+
{'packages': [{'version': 'git_revision:b3bf672474a2bff82f33e1176aa803539baa0d60+1', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
157157

158158
'src/third_party/dart/third_party/pkg/args':
159159
Var('dart_git') + '/args.git@d8fea36c10ef96797be02e3d132d572445cd86f4',
@@ -210,7 +210,7 @@ deps = {
210210
Var('dart_git') + '/html.git@00cd3c22dac0e68e6ed9e7e4945101aedb1b3109',
211211

212212
'src/third_party/dart/third_party/pkg/http':
213-
Var('dart_git') + '/http.git@abb2bb182fbd7f03aafd1f889b902d7b3bdb8769',
213+
Var('dart_git') + '/http.git@e89b190936d53d0e36148436283e28ba1091b35a',
214214

215215
'src/third_party/dart/third_party/pkg/http_multi_server':
216216
Var('dart_git') + '/http_multi_server.git@de1b312164c24a1690b46c6e97bd47eff40c4649',
@@ -342,7 +342,7 @@ deps = {
342342
Var('dart_git') + '/package_config.git@a84c0d45401f215fbe9384df923a38f4022a3c45',
343343

344344
'src/third_party/dart/tools/sdks':
345-
{'packages': [{'version': 'version:2.13.0-211.14.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
345+
{'packages': [{'version': 'version:2.13.1', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
346346

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

@@ -542,7 +542,7 @@ deps = {
542542
'packages': [
543543
{
544544
'package': 'fuchsia/third_party/clang/mac-amd64',
545-
'version': 'bf4GDBSQEjRrv9-8G-pOt4fZqohuxEKEr4F6Gic7JRsC'
545+
'version': 'rm-r5Uy50UmkWHJNZYzaS8cy_Q5S53cCwGw4BplIgecC'
546546
}
547547
],
548548
'condition': 'host_os == "mac"',
@@ -579,7 +579,7 @@ deps = {
579579
'packages': [
580580
{
581581
'package': 'fuchsia/sdk/core/mac-amd64',
582-
'version': '5c4YB-7_rKXvMfedW8WXTUct15-kAGFGgg74XYAFg7MC'
582+
'version': 'vGpSL2e_a3b73DJKgcrQvQpumQ8Zzp8takhRDJB32X0C'
583583
}
584584
],
585585
'condition': 'host_os == "mac"',
@@ -589,7 +589,7 @@ deps = {
589589
'packages': [
590590
{
591591
'package': 'fuchsia/sdk/core/linux-amd64',
592-
'version': 'Y13BYMF29W-Zpih9AwTvd1wEN5GkFYwLX7p-JHbjw_oC'
592+
'version': '3Xj5uw866nZkmta-RNPf1Gb4VReP8Qn2VYhuyZ9FUDgC'
593593
}
594594
],
595595
'condition': 'host_os == "linux"',

‎ci/licenses_golden/licenses_flutter

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ FILE: ../../../flutter/fml/platform/darwin/string_range_sanitization_unittests.m
229229
FILE: ../../../flutter/fml/platform/fuchsia/message_loop_fuchsia.cc
230230
FILE: ../../../flutter/fml/platform/fuchsia/message_loop_fuchsia.h
231231
FILE: ../../../flutter/fml/platform/fuchsia/paths_fuchsia.cc
232+
FILE: ../../../flutter/fml/platform/fuchsia/task_observers.cc
233+
FILE: ../../../flutter/fml/platform/fuchsia/task_observers.h
232234
FILE: ../../../flutter/fml/platform/linux/message_loop_linux.cc
233235
FILE: ../../../flutter/fml/platform/linux/message_loop_linux.h
234236
FILE: ../../../flutter/fml/platform/linux/paths_linux.cc
@@ -313,6 +315,7 @@ FILE: ../../../flutter/lib/ui/compositing/scene.cc
313315
FILE: ../../../flutter/lib/ui/compositing/scene.h
314316
FILE: ../../../flutter/lib/ui/compositing/scene_builder.cc
315317
FILE: ../../../flutter/lib/ui/compositing/scene_builder.h
318+
FILE: ../../../flutter/lib/ui/compositing/scene_builder_unittests.cc
316319
FILE: ../../../flutter/lib/ui/compositing/scene_host.cc
317320
FILE: ../../../flutter/lib/ui/compositing/scene_host.h
318321
FILE: ../../../flutter/lib/ui/dart_runtime_hooks.cc
@@ -411,6 +414,9 @@ FILE: ../../../flutter/lib/ui/semantics/semantics_update.cc
411414
FILE: ../../../flutter/lib/ui/semantics/semantics_update.h
412415
FILE: ../../../flutter/lib/ui/semantics/semantics_update_builder.cc
413416
FILE: ../../../flutter/lib/ui/semantics/semantics_update_builder.h
417+
FILE: ../../../flutter/lib/ui/semantics/semantics_update_builder_unittests.cc
418+
FILE: ../../../flutter/lib/ui/semantics/string_attribute.cc
419+
FILE: ../../../flutter/lib/ui/semantics/string_attribute.h
414420
FILE: ../../../flutter/lib/ui/snapshot_delegate.h
415421
FILE: ../../../flutter/lib/ui/text.dart
416422
FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
@@ -486,6 +492,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
486492
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
487493
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
488494
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
495+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
489496
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
490497
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
491498
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/vertices.dart
@@ -1198,6 +1205,9 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfa
11981205
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.h
11991206
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm
12001207
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm
1208+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h
1209+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.mm
1210+
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm
12011211
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h
12021212
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.mm
12031213
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h
@@ -1325,7 +1335,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/meta/vmservi
13251335
FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc
13261336
FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h
13271337
FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
1328-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/collect_traces.dart
13291338
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component.cc
13301339
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component.h
13311340
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_unittest.cc
@@ -1352,8 +1361,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.cc
13521361
FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.h
13531362
FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard_unittest.cc
13541363
FILE: ../../../flutter/shell/platform/fuchsia/flutter/logging.h
1355-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/loop.cc
1356-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/loop.h
13571364
FILE: ../../../flutter/shell/platform/fuchsia/flutter/main.cc
13581365
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_product_runtime
13591366
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_runtime
@@ -1375,12 +1382,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_tzdata_unittest.cc
13751382
FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_unittest.cc
13761383
FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc
13771384
FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.h
1378-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_observers.cc
1379-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_observers.h
13801385
FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.cc
13811386
FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.h
1382-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/thread.cc
1383-
FILE: ../../../flutter/shell/platform/fuchsia/flutter/thread.h
13841387
FILE: ../../../flutter/shell/platform/fuchsia/flutter/unique_fdio_ns.h
13851388
FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.cc
13861389
FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.h

‎ci/licenses_golden/licenses_fuchsia

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

33
UNUSED LICENSES:
44

@@ -3405,8 +3405,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34053405

34063406
====================================================================================================
34073407
LIBRARY: fuchsia_sdk
3408-
ORIGIN: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/reader/diagnostic_config.dart + ../../../fuchsia/sdk/linux/LICENSE
3408+
ORIGIN: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/codegen_common.dart + ../../../fuchsia/sdk/linux/LICENSE
34093409
TYPE: LicenseType.bsd
3410+
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/codegen_common.dart
34103411
FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/reader.dart
34113412
FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/reader/diagnostic_config.dart
34123413
FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_inspect/lib/src/reader/diagnostic_data.dart
@@ -3418,6 +3419,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics.types/component.fidl
34183419
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider_controller.fidl
34193420
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/dai_connect.fidl
34203421
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/goldfish_sync.fidl
3422+
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/port.fidl
34213423
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.input.virtualkeyboard/virtual_keyboard.fidl
34223424
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io2/inotify.fidl
34233425
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.scenic.allocation/allocator.fidl

0 commit comments

Comments
 (0)