Skip to content

Commit bab44e8

Browse files
committed
Merge remote-tracking branch 'origin/master' into di/29b-1-flutter-plugins
2 parents b726dcf + 2381790 commit bab44e8

182 files changed

Lines changed: 10934 additions & 2286 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: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3904,6 +3904,9 @@ targets:
39043904
recipe: devicelab/devicelab_drone
39053905
timeout: 60
39063906
properties:
3907+
# Pin to macOS 26 due to benchmark differing while fleet is split between macOS 15 and 26.
3908+
# See https://github.com/flutter/flutter/issues/194809.
3909+
os: Mac-26.6 # TODO(flutter/flutter#192579): Delete this after all bots are upgraded to macOS 26.
39073910
task_name: basic_material_app_macos__compile
39083911

39093912
- name: Mac_arm64 build_ios_framework_module_test
@@ -3930,7 +3933,6 @@ targets:
39303933
recipe: flutter/flutter_drone
39313934
presubmit: false # Rely on Mac_arm build_tests in presubmit.
39323935
enabled_branches:
3933-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
39343936
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
39353937
timeout: 60
39363938
properties:
@@ -3953,7 +3955,6 @@ targets:
39533955
recipe: flutter/flutter_drone
39543956
presubmit: false # Rely on Mac_arm build_tests in presubmit.
39553957
enabled_branches:
3956-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
39573958
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
39583959
timeout: 60
39593960
properties:
@@ -3976,7 +3977,6 @@ targets:
39763977
recipe: flutter/flutter_drone
39773978
presubmit: false # Rely on Mac_arm build_tests in presubmit.
39783979
enabled_branches:
3979-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
39803980
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
39813981
timeout: 60
39823982
properties:
@@ -3999,7 +3999,6 @@ targets:
39993999
recipe: flutter/flutter_drone
40004000
presubmit: false # Rely on Mac_arm build_tests in presubmit.
40014001
enabled_branches:
4002-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
40034002
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
40044003
timeout: 60
40054004
properties:
@@ -4022,7 +4021,6 @@ targets:
40224021
recipe: flutter/flutter_drone
40234022
presubmit: false # Rely on Mac_arm build_tests in presubmit.
40244023
enabled_branches:
4025-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
40264024
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
40274025
timeout: 60
40284026
properties:
@@ -4332,7 +4330,6 @@ targets:
43324330
recipe: flutter/flutter_drone
43334331
timeout: 60
43344332
enabled_branches:
4335-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
43364333
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
43374334
properties:
43384335
dependencies: >-
@@ -4649,7 +4646,6 @@ targets:
46494646
recipe: devicelab/devicelab_drone
46504647
timeout: 60
46514648
enabled_branches:
4652-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
46534649
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
46544650
properties:
46554651
dependencies: >-
@@ -4792,7 +4788,6 @@ targets:
47924788
recipe: flutter/flutter_drone
47934789
timeout: 60
47944790
enabled_branches:
4795-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
47964791
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
47974792
properties:
47984793
dependencies: >-
@@ -4815,7 +4810,6 @@ targets:
48154810
recipe: flutter/flutter_drone
48164811
timeout: 60
48174812
enabled_branches:
4818-
- beta # TODO(flutter/flutter#189302): Remove after 3.48.0-0.1.pre is released.
48194813
- stable # TODO(flutter/flutter#189302): Delete this builder after 3.50 is released.
48204814
properties:
48214815
dependencies: >-
@@ -5108,7 +5102,6 @@ targets:
51085102
recipe: flutter/flutter_drone
51095103
timeout: 60
51105104
enabled_branches:
5111-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
51125105
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
51135106
properties:
51145107
add_recipes_cq: "true"
@@ -5254,7 +5247,6 @@ targets:
52545247
recipe: devicelab/devicelab_drone
52555248
presubmit: false
52565249
enabled_branches:
5257-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
52585250
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
52595251
timeout: 60
52605252
properties:
@@ -5287,7 +5279,6 @@ targets:
52875279
recipe: devicelab/devicelab_drone
52885280
presubmit: false
52895281
enabled_branches:
5290-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
52915282
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
52925283
timeout: 60
52935284
properties:
@@ -5340,7 +5331,6 @@ targets:
53405331
recipe: devicelab/devicelab_drone
53415332
presubmit: false
53425333
enabled_branches:
5343-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
53445334
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
53455335
runIf:
53465336
- .ci.yaml
@@ -5373,7 +5363,6 @@ targets:
53735363
recipe: devicelab/devicelab_drone
53745364
presubmit: false
53755365
enabled_branches:
5376-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
53775366
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
53785367
runIf:
53795368
- .ci.yaml
@@ -5583,7 +5572,6 @@ targets:
55835572
recipe: devicelab/devicelab_drone
55845573
timeout: 60
55855574
enabled_branches:
5586-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
55875575
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
55885576
properties:
55895577
dependencies: >-
@@ -5621,7 +5609,6 @@ targets:
56215609
recipe: devicelab/devicelab_drone
56225610
presubmit: false
56235611
enabled_branches:
5624-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
56255612
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
56265613
timeout: 60
56275614
properties:
@@ -5696,7 +5683,6 @@ targets:
56965683
recipe: devicelab/devicelab_drone
56975684
presubmit: false
56985685
enabled_branches:
5699-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
57005686
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
57015687
timeout: 60
57025688
properties:
@@ -5758,7 +5744,6 @@ targets:
57585744
recipe: devicelab/devicelab_drone
57595745
presubmit: false
57605746
enabled_branches:
5761-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
57625747
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
57635748
timeout: 60
57645749
properties:
@@ -5836,15 +5821,6 @@ targets:
58365821
["devicelab", "ios", "mac"]
58375822
task_name: new_gallery_ios__transition_perf
58385823

5839-
- name: Mac_ios new_gallery_skia_ios__transition_perf
5840-
recipe: devicelab/devicelab_drone
5841-
presubmit: false
5842-
timeout: 60
5843-
properties:
5844-
tags: >
5845-
["devicelab", "ios", "mac"]
5846-
task_name: new_gallery_skia_ios__transition_perf
5847-
58485824
- name: Mac platform_channel_sample_test_ios
58495825
recipe: devicelab/devicelab_drone
58505826
presubmit: false
@@ -5976,7 +5952,6 @@ targets:
59765952
recipe: devicelab/devicelab_drone
59775953
presubmit: false
59785954
enabled_branches:
5979-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
59805955
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
59815956
timeout: 60
59825957
properties:
@@ -6076,7 +6051,6 @@ targets:
60766051
recipe: devicelab/devicelab_drone
60776052
timeout: 60
60786053
enabled_branches:
6079-
- beta # TODO(flutter/flutter#189295): Remove after 3.48.0-0.1.pre is released.
60806054
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
60816055
properties:
60826056
dependencies: >-
@@ -7944,6 +7918,8 @@ targets:
79447918
recipe: devicelab/devicelab_drone
79457919
bringup: true
79467920
timeout: 60
7921+
enabled_branches:
7922+
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
79477923
properties:
79487924
tags: >
79497925
["devicelab", "android", "mac", "mokey"]

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
3232

3333
## Flutter 3.47 Changes
3434

35+
### [3.47.8](https://github.com/flutter/flutter/releases/tag/3.47.8)
36+
#### Security advisory [GHSA-frr6-h895-5pxp](https://github.com/dart-lang/sdk/security/advisories/GHSA-frr6-h895-5pxp):
37+
- [dart/568000](https://dart-review.googlesource.com/c/sdk/+/568000) Updates BoringSSL in the Dart runtime (3.13.7) to block compromised eMudhra intermediate CA certificates.
38+
- [dart/64696](https://github.com/dart-lang/sdk/pull/64696) Updates `dart:io` on Android 14+ to use the updatable Conscrypt APEX root certificate store.
39+
- Developers shipping Android, Windows, or Linux applications should upgrade to Flutter 3.47.8 and rebuild their apps.
40+
---
41+
- [flutter/190235](https://github.com/flutter/flutter/issues/190235) When running flutter pub get or building desktop apps with existing or broken plugin symlink entries, flutter_tools no longer crashes with a PathExistsException.
42+
- [flutter/192934](https://github.com/flutter/flutter/issues/192934) When dumping the focus tree or layer tree from flutter run on any platform before the UI isolate finishes initializing or after teardown, flutter_tools crashed with a null check operator exception.
43+
3544
### [3.47.7](https://github.com/flutter/flutter/releases/tag/3.47.7)
3645
- [flutter/182604](https://github.com/flutter/flutter/issues/182604) When an OverlayPortal is displayed on iOS, accessibility frames are shrunk by the device pixel ratio and anchored to the top-left, so VoiceOver focus and XCUITest taps miss the visible controls.
3746
- [flutter/100946](https://github.com/flutter/flutter/issues/100946) When using VoiceOver on iOS with a ReorderableListView, Semantics focus is incorrectly shifted to the top left of the screen.

‎DEPS‎

Lines changed: 3 additions & 3 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': '87eb6de3ac825eda202896de2391ea45a5dc1d5d',
18+
'skia_revision': 'ab9b798555a6cc38e7adeacb86ca6a99c5be5819',
1919

2020
# Do not download the Emscripten SDK by default.
2121
# This prevents us from downloading the Emscripten toolchain for builds
@@ -55,7 +55,7 @@ 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': 'bf3ac3ef9db22c7365392d2af260c792a86d802f',
58+
'dart_revision': '65fc979759ca82d3f750fb644fd00f963d47e111',
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
@@ -304,7 +304,7 @@ deps = {
304304
Var('chromium_git') + '/external/github.com/google/re2' + '@' + 'c84a140c93352cdabbfb547c531be34515b12228',
305305

306306
'engine/src/flutter/third_party/brotli':
307-
Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + '350100a5bb9d9671aca85213b2ec7a70a361b0cd',
307+
Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + 'db24a98aed38a16de78cc05ca15cdd8dc2a0d92d',
308308

309309
'engine/src/flutter/third_party/yapf':
310310
Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',

‎TESTOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
/dev/devicelab/bin/tasks/native_assets_ios.dart @dcharkes @flutter/ios
223223
/dev/devicelab/bin/tasks/native_platform_view_ui_tests_ios.dart @hellohuanlin @flutter/ios
224224
/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart @jtmcdole @flutter/engine
225-
/dev/devicelab/bin/tasks/new_gallery_skia_ios__transition_perf.dart @jtmcdole @flutter/engine
226225
/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart @hellohuanlin @flutter/engine
227226
/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @hellohuanlin @flutter/engine
228227
/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
108dad0d562e9368a45b6b5cdcc26c137bc071c4
1+
a8549ae8080b70a087f0eb7faee991fc12113dd9

‎dev/benchmarks/macrobenchmarks/lib/src/web/recorder.dart‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,43 @@ const int _kDefaultWarmUpSampleCount = 200;
2727
/// The default number of samples collected to compute benchmark statistics.
2828
///
2929
/// This value is used when [Profile.useCustomWarmUp] is set to false.
30-
const int _kDefaultMeasuredSampleCount = 100;
30+
///
31+
/// Defaults to 100 and can be overridden at compile time with
32+
/// `--dart-define=BENCHMARK_MEASURED_SAMPLES=<n>`, where `<n>` must be a
33+
/// positive integer no greater than 800 (`dynamic_clip_on_static_picture`
34+
/// scrolls out of its picture beyond that).
35+
const int _kDefaultMeasuredSampleCount = int.fromEnvironment(
36+
'BENCHMARK_MEASURED_SAMPLES',
37+
defaultValue: 100,
38+
);
3139

3240
/// The default total number of samples collected by a benchmark.
3341
///
3442
/// This value is used when [Profile.useCustomWarmUp] is set to false.
3543
const int kDefaultTotalSampleCount = _kDefaultWarmUpSampleCount + _kDefaultMeasuredSampleCount;
3644

45+
/// Whether [Profile.toJson] includes the raw samples of each series.
46+
///
47+
/// When enabled, each series reports its measured samples under
48+
/// `<series>.samples` and its warm-up samples under `<series>.warmUpSamples`,
49+
/// both as sample magnitudes in microseconds.
50+
///
51+
/// Opt-in via `--dart-define=BENCHMARK_REPORT_SAMPLES=true`. When unset, the
52+
/// reported JSON is unchanged.
53+
const bool _kReportSamples = bool.fromEnvironment('BENCHMARK_REPORT_SAMPLES');
54+
55+
/// A phase of a benchmark run reported to a [BenchmarkPhaseListener].
56+
enum BenchmarkPhase {
57+
/// Warm-up has ended and measured samples start being recorded.
58+
measure,
59+
}
60+
61+
/// Called when a benchmark named [benchmarkName] enters a new [phase].
62+
///
63+
/// Currently the only reported phase is [BenchmarkPhase.measure], which is
64+
/// reported when warm-up ends and measured samples start being recorded.
65+
typedef BenchmarkPhaseListener = void Function(String benchmarkName, BenchmarkPhase phase);
66+
3767
/// A benchmark metric that includes frame-related computations prior to
3868
/// submitting layer and picture operations to the underlying renderer, such as
3969
/// CanvasKit. During this phase we compute transforms, clips, and other
@@ -868,6 +898,13 @@ class Profile {
868898
/// [kDefaultTotalSampleCount] samples and stops automatically.
869899
Profile({required this.name, this.useCustomWarmUp = false});
870900

901+
/// An optional listener notified when any profile changes phase.
902+
///
903+
/// Null by default, in which case no notifications are sent. It is invoked
904+
/// synchronously from [stopWarmingUp] with [BenchmarkPhase.measure], so it
905+
/// must not block.
906+
static BenchmarkPhaseListener? phaseListener;
907+
871908
/// The name of the benchmark that produced this profile.
872909
final String name;
873910

@@ -894,6 +931,7 @@ class Profile {
894931
throw StateError('Warm-up already stopped.');
895932
} else {
896933
_isWarmingUp = false;
934+
Profile.phaseListener?.call(name, BenchmarkPhase.measure);
897935
}
898936
}
899937

@@ -1024,7 +1062,16 @@ class Profile {
10241062

10251063
/// Returns a JSON representation of the profile that will be sent to the
10261064
/// server.
1027-
Map<String, dynamic> toJson() {
1065+
///
1066+
/// If [reportSamples] is true, each series also reports two flat lists of
1067+
/// raw sample magnitudes in microseconds, both in recording order:
1068+
///
1069+
/// * `<series>.samples`: the measured (non-warm-up) samples.
1070+
/// * `<series>.warmUpSamples`: the warm-up samples.
1071+
///
1072+
/// It defaults to the opt-in `--dart-define=BENCHMARK_REPORT_SAMPLES=true`
1073+
/// setting, which is off. When off, neither key is reported.
1074+
Map<String, dynamic> toJson({bool reportSamples = _kReportSamples}) {
10281075
final scoreKeys = <String>[];
10291076
final json = <String, dynamic>{'name': name, 'scoreKeys': scoreKeys};
10301077

@@ -1044,6 +1091,16 @@ class Profile {
10441091
json['$key.outlierAverage'] = stats.outlierAverage;
10451092
json['$key.outlierRatio'] = stats.outlierRatio;
10461093
json['$key.noise'] = stats.noise;
1094+
if (reportSamples) {
1095+
json['$key.samples'] = <double>[
1096+
for (final AnnotatedSample sample in stats.samples)
1097+
if (!sample.isWarmUpValue) sample.magnitude,
1098+
];
1099+
json['$key.warmUpSamples'] = <double>[
1100+
for (final AnnotatedSample sample in stats.samples)
1101+
if (sample.isWarmUpValue) sample.magnitude,
1102+
];
1103+
}
10471104
}
10481105

10491106
json.addAll(extraData);

0 commit comments

Comments
 (0)