Skip to content

Commit a57d2e0

Browse files
authored
Merge branch 'master' into fix-plugin-registrant-codegen-injection
2 parents 419defa + 87f3828 commit a57d2e0

1,427 files changed

Lines changed: 6831 additions & 2789 deletions

File tree

Some content is hidden

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

‎.ci.yaml‎

Lines changed: 21 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,143 +2255,6 @@ targets:
22552255
- engine/**
22562256
- DEPS
22572257

2258-
- name: Linux web_skwasm_tests_2
2259-
recipe: flutter/flutter_drone
2260-
bringup: true
2261-
timeout: 45
2262-
properties:
2263-
dependencies: >-
2264-
[
2265-
{"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
2266-
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
2267-
]
2268-
shard: web_skwasm_tests
2269-
subshard: "2"
2270-
tags: >
2271-
["framework", "hostonly", "shard", "linux"]
2272-
test_timeout_secs: "2700"
2273-
runIf:
2274-
- dev/**
2275-
- packages/**
2276-
- bin/**
2277-
- .ci.yaml
2278-
- engine/**
2279-
- DEPS
2280-
2281-
- name: Linux web_skwasm_tests_3
2282-
recipe: flutter/flutter_drone
2283-
bringup: true
2284-
timeout: 45
2285-
properties:
2286-
dependencies: >-
2287-
[
2288-
{"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
2289-
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
2290-
]
2291-
shard: web_skwasm_tests
2292-
subshard: "3"
2293-
tags: >
2294-
["framework", "hostonly", "shard", "linux"]
2295-
test_timeout_secs: "2700"
2296-
runIf:
2297-
- dev/**
2298-
- packages/**
2299-
- bin/**
2300-
- .ci.yaml
2301-
- engine/**
2302-
- DEPS
2303-
2304-
- name: Linux web_skwasm_tests_4
2305-
recipe: flutter/flutter_drone
2306-
bringup: true
2307-
timeout: 45
2308-
properties:
2309-
dependencies: >-
2310-
[
2311-
{"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
2312-
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
2313-
]
2314-
shard: web_skwasm_tests
2315-
subshard: "4"
2316-
tags: >
2317-
["framework", "hostonly", "shard", "linux"]
2318-
test_timeout_secs: "2700"
2319-
runIf:
2320-
- dev/**
2321-
- packages/**
2322-
- bin/**
2323-
- .ci.yaml
2324-
- engine/**
2325-
- DEPS
2326-
2327-
- name: Linux web_skwasm_tests_5
2328-
recipe: flutter/flutter_drone
2329-
bringup: true
2330-
timeout: 45
2331-
properties:
2332-
dependencies: >-
2333-
[
2334-
{"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
2335-
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
2336-
]
2337-
shard: web_skwasm_tests
2338-
subshard: "5"
2339-
tags: >
2340-
["framework", "hostonly", "shard", "linux"]
2341-
test_timeout_secs: "2700"
2342-
runIf:
2343-
- dev/**
2344-
- packages/**
2345-
- bin/**
2346-
- .ci.yaml
2347-
- engine/**
2348-
- DEPS
2349-
2350-
- name: Linux web_skwasm_tests_6
2351-
recipe: flutter/flutter_drone
2352-
bringup: true
2353-
timeout: 45
2354-
properties:
2355-
dependencies: >-
2356-
[
2357-
{"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
2358-
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
2359-
]
2360-
shard: web_skwasm_tests
2361-
subshard: "6"
2362-
tags: >
2363-
["framework", "hostonly", "shard", "linux"]
2364-
test_timeout_secs: "2700"
2365-
runIf:
2366-
- dev/**
2367-
- packages/**
2368-
- bin/**
2369-
- .ci.yaml
2370-
- engine/**
2371-
- DEPS
2372-
2373-
- name: Linux web_skwasm_tests_7_last
2374-
recipe: flutter/flutter_drone
2375-
bringup: true
2376-
timeout: 45
2377-
properties:
2378-
dependencies: >-
2379-
[
2380-
{"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
2381-
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
2382-
]
2383-
shard: web_skwasm_tests
2384-
subshard: "7_last"
2385-
tags: >
2386-
["framework", "hostonly", "shard", "linux"]
2387-
test_timeout_secs: "2700"
2388-
runIf:
2389-
- dev/**
2390-
- packages/**
2391-
- bin/**
2392-
- .ci.yaml
2393-
- engine/**
2394-
- DEPS
23952258

23962259
- name: Linux web_tool_tests
23972260
recipe: flutter/flutter_drone
@@ -5478,13 +5341,18 @@ targets:
54785341
["devicelab", "ios", "mac"]
54795342
task_name: route_test_ios
54805343

5481-
- name: Mac_ios flavors_test_ios
5344+
- name: Mac flavors_test_ios
54825345
recipe: devicelab/devicelab_drone
54835346
presubmit: false
5347+
bringup: true
54845348
timeout: 60
54855349
properties:
5350+
dependencies: >-
5351+
[
5352+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5353+
]
54865354
tags: >
5487-
["devicelab", "ios", "mac"]
5355+
["devicelab", "hostonly", "mac"]
54885356
task_name: flavors_test_ios
54895357

54905358
- name: Mac_arm64_ios flutter_gallery_ios__compile
@@ -7256,6 +7124,20 @@ targets:
72567124
]
72577125
task_name: windows_home_scroll_perf__timeline_summary
72587126

7127+
- name: Windows windows_text_shadow_perf__timeline_summary
7128+
recipe: devicelab/devicelab_drone
7129+
presubmit: false
7130+
bringup: true
7131+
timeout: 60
7132+
properties:
7133+
tags: >
7134+
["devicelab", "hostonly", "windows"]
7135+
dependencies: >-
7136+
[
7137+
{"dependency": "vs_build", "version": "version:vs2019"}
7138+
]
7139+
task_name: windows_text_shadow_perf__timeline_summary
7140+
72597141
- name: Windows_arm64 windows_home_scroll_perf__timeline_summary
72607142
recipe: devicelab/devicelab_drone
72617143
presubmit: false

‎.gemini/styleguide.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ flutter/flutter repository. It is based on the more comprehensive official
2929
- **Search for counter-examples**: Identify scenarios or edge cases that the proposed code does not handle. If a counter-example is found, propose a test case to demonstrate the gap.
3030
- **Suggest simplification and refactoring**: Assess whether the code can be made simpler or refactored to enhance readability and maintainability.
3131

32+
### What Not to Report
33+
34+
- **Do not report syntax errors**: Leave the detection of syntax errors to the analyzer. The review agent should focus on higher-level concerns such as logic, design, and maintainability rather than issues that automated tooling already catches.
35+
3236
## General Philosophy
3337

3438
- **Optimize for readability**: Code is read more often than it is written.

‎.github/labeler.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
'd: api docs':
5151
- changed-files:
5252
- any-glob-to-any-file:
53-
- examples/api/**/*
53+
- packages/flutter/examples/api/**/*
5454

5555
'd: docs/':
5656
- changed-files:
@@ -61,6 +61,7 @@
6161
- changed-files:
6262
- any-glob-to-any-file:
6363
- examples/**/*
64+
- packages/flutter/examples/**/*
6465

6566
'e: embedder':
6667
- changed-files:
@@ -138,7 +139,6 @@ framework:
138139
- packages/flutter_localizations/**/*
139140
- packages/flutter_test/**/*
140141
- packages/integration_test/**/*
141-
- examples/api/**/*
142142
- docs/about/**/*
143143
- docs/contributing/**/*
144144
- docs/libraries/**/*

‎.github/workflows/freeze.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
token: ${{ github.token }}
3333
filters: |
3434
frozen:
35+
- 'packages/flutter/examples/api/lib/material/**'
36+
- 'packages/flutter/examples/api/lib/cupertino/**'
37+
- 'packages/flutter/examples/api/test/material/**'
38+
- 'packages/flutter/examples/api/test/cupertino/**'
3539
- 'packages/flutter/lib/src/material/**'
3640
- 'packages/flutter/lib/src/cupertino/**'
3741
- 'packages/flutter/test/material/**'
3842
- 'packages/flutter/test/cupertino/**'
39-
- 'examples/api/lib/material/**'
40-
- 'examples/api/lib/cupertino/**'
41-
- 'examples/api/test/material/**'
42-
- 'examples/api/test/cupertino/**'
4343
- 'packages/flutter/lib/fix_data/fix_cupertino.yaml'
4444
- 'packages/flutter/lib/fix_data/fix_material/**'
4545
- 'packages/flutter/test_fixes/material/**'

‎DEPS‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vars = {
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
1717
'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
18-
'skia_revision': 'ad7abeecbb6ddc1ceaaec7cb987fc893ca7e9a62',
18+
'skia_revision': '339bedab6766ec57f2000034a643f84db95d7166',
1919

2020
# Do not download the Emscripten SDK by default.
2121
# This prevents us from downloading the Emscripten toolchain for builds
@@ -55,24 +55,24 @@ vars = {
5555
# updated revision list of existing dependencies. You will need to
5656
# gclient sync before and after update deps to ensure all deps are updated.
5757
# updated revision list of existing dependencies.
58-
'dart_revision': '941e2ec4ff23b3c8f4292ddf802a91c026937195',
58+
'dart_revision': '558fb298e458b75551bc19aaecbd1243cb72c45f',
5959

6060
# WARNING: DO NOT EDIT MANUALLY
6161
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6262
'dart_binaryen_rev': '9926156a583cec3d22d521232b31c70fa9a87dc1',
63-
'dart_boringssl_rev': '7515be5ccd601ae0433d3682ba7737592b402014',
64-
'dart_core_rev': 'fe516ee1b38cc60e7a8c6e082c337037a043d782',
63+
'dart_boringssl_rev': '619e6bc3deda4e0d2fe4ad3fc439ae4fc1e00caf',
64+
'dart_core_rev': '4a5ae2bc9db1f39fac071f1a6fade64bd155f734',
6565
'dart_devtools_rev': '21f1838f3a9b138ac377efb953ca5a53c8832e75',
66-
'dart_ecosystem_rev': 'edfdb3b4063b9034b708144633a700204f865f43',
67-
'dart_http_rev': '5d94ef52582867e077bf41c3fa20fb8b1d1d834e',
66+
'dart_ecosystem_rev': 'ed9c592c1d35106c0a8a52044426515017a60646',
67+
'dart_http_rev': '9cb80c77562569705dd2089839a5526c5318c321',
6868
'dart_i18n_rev': 'e1b5a798f8922bb27bbc6d858748ece6f9a19f02',
6969
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7070
'dart_protobuf_rev': '91efb90f437bb6a30e6726c3369a2fcb9bba06e7',
7171
'dart_pub_rev': '7654d523a42e764fad77c9e7b63a9686b88c9323',
7272
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
73-
'dart_tools_rev': 'b827a6e38b934232c7f7b8728a5aef6165e7df2d',
73+
'dart_tools_rev': 'f3ec9ed5a7b25dfef256bea9827dc1f81c8c7afc',
7474
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
75-
'dart_web_rev': '12a9ca2ebc08f5a6f2d69aebc7daa1f5a2e6a431',
75+
'dart_web_rev': 'f1b9d561850355efd81b24fdbfd226dbe805d415',
7676
'dart_webdriver_rev': '3a711ebb36871eac997c5d5d2429f7414873dc63',
7777
'dart_webkit_inspection_protocol_rev': '762115a971d1968bc940454ad1e88d506d8c5640',
7878

@@ -199,7 +199,7 @@ vars = {
199199
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
200200
# will be used altogether with fuchsia-sdk to setup the build / test
201201
# environment.
202-
'fuchsia_test_scripts_version': 'vcANVO8VIDQHasH1X_XRoSYLvx7fNwvTbDM1NT9TwA4C',
202+
'fuchsia_test_scripts_version': 'k7zairCweHf0pULkjCYUmHY77xtMc39w0_VHs6AFBAwC',
203203

204204
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
205205
# used altogether with fuchsia-sdk to generate gn based build rules.
@@ -339,7 +339,7 @@ deps = {
339339
Var('dart_git') + '/dart_style.git@dfdf6420c7ea923d28edef3f11e89b4ff23d03bf',
340340

341341
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
342-
Var('dart_git') + '/dartdoc.git@ac96918074974dcd4ea20f764f17090f58c1e428',
342+
Var('dart_git') + '/dartdoc.git@1fd02f73cfb2ade871f9ff9b96e7475fb81d5ce8',
343343

344344
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
345345
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -363,7 +363,7 @@ deps = {
363363
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
364364

365365
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
366-
Var('dart_git') + '/shelf.git@6918a7690946044b4098e9f6735439044c676e13',
366+
Var('dart_git') + '/shelf.git@fb3f931d2c158d794e83c1b76b7be4b625db3c28',
367367

368368
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
369369
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -372,7 +372,7 @@ deps = {
372372
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
373373

374374
'engine/src/flutter/third_party/dart/third_party/pkg/test':
375-
Var('dart_git') + '/test.git@4838365e7fb3a2d0302cdbbd8330b7884f7d3c0d',
375+
Var('dart_git') + '/test.git@dd426d439da9d399975a3455d4d507bce9fec01b',
376376

377377
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
378378
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -830,7 +830,7 @@ deps = {
830830
'packages': [
831831
{
832832
'package': 'fuchsia/sdk/core/linux-amd64',
833-
'version': '_J8wM3kyQpLN9wvRD5upBr9L1g5TCYF3Oc8P0m3QeZMC'
833+
'version': 'SFq4FVodIOQAS26LraIN4MNNWCZmirSJvNBY-OO-yZsC'
834834
}
835835
],
836836
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎TESTOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@
333333
/dev/devicelab/bin/tasks/windows_desktop_impeller.dart @jonahwilliams @flutter/engine
334334
/dev/devicelab/bin/tasks/windows_engine_integration_golden_test.dart @b-luk @flutter/engine
335335
/dev/devicelab/bin/tasks/windows_home_scroll_perf__timeline_summary.dart @jonahwilliams @flutter/engine
336+
/dev/devicelab/bin/tasks/windows_text_shadow_perf__timeline_summary.dart @gaaclarke @flutter/engine
336337
/dev/devicelab/bin/tasks/windows_startup_test.dart @loic-sharma @flutter/desktop
337338

338339
## Host only framework tests
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4e3f83d37f83af1c25a5006d13efce4b5d18d4b3
1+
aaaf246a1c18570682055aa08981652c67bde9a8

‎dev/benchmarks/macrobenchmarks/lib/common.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const String kDrawAtlasPageRouteName = '/draw_atlas';
4545
const String kAnimatedAdvancedBlend = '/animated_advanced_blend';
4646
const String kRRectBlurRouteName = '/rrect_blur';
4747
const String kRSuperellipseBlurRouteName = '/rsuperellipse_blur';
48+
const String kTextShadowPerfRouteName = '/text_shadow_perf';
4849

4950
const String kOpacityPeepholeOneRectRouteName = '$kOpacityPeepholeRouteName/one_big_rect';
5051
const String kOpacityPeepholeColumnOfOpacityRouteName =

‎dev/benchmarks/macrobenchmarks/lib/main.dart‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import 'src/simple_animation.dart';
4444
import 'src/simple_scroll.dart';
4545
import 'src/sliders.dart';
4646
import 'src/text.dart';
47+
import 'src/text_shadow_perf.dart';
4748
import 'src/very_long_picture_scrolling.dart';
4849

4950
const String kMacrobenchmarks = 'Macrobenchmarks';
@@ -118,6 +119,7 @@ class MacrobenchmarksApp extends StatelessWidget {
118119
const DrawArcsPage(paintStyle: PaintingStyle.fill),
119120
kDrawArcsAllStrokeStylesPageRouteName: (BuildContext context) =>
120121
const DrawArcsPage(paintStyle: PaintingStyle.stroke),
122+
kTextShadowPerfRouteName: (BuildContext context) => const TextShadowPerfPage(),
121123
},
122124
);
123125
}
@@ -429,6 +431,13 @@ class HomePage extends StatelessWidget {
429431
Navigator.pushNamed(context, kDrawArcsAllStrokeStylesPageRouteName);
430432
},
431433
),
434+
ElevatedButton(
435+
key: const Key(kTextShadowPerfRouteName),
436+
child: const Text('Text Shadow Performance'),
437+
onPressed: () {
438+
Navigator.pushNamed(context, kTextShadowPerfRouteName);
439+
},
440+
),
432441
],
433442
),
434443
);

0 commit comments

Comments
 (0)