Skip to content

Commit 6e2209b

Browse files
AnishishiAnishishi
committed
resolve conflicts
2 parents cfedd82 + a1f8c99 commit 6e2209b

File tree

427 files changed

+3509
-5256
lines changed

Some content is hidden

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

427 files changed

+3509
-5256
lines changed

‎.ci.yaml

Lines changed: 118 additions & 76 deletions
Large diffs are not rendered by default.

‎.github/ISSUE_TEMPLATE/5_performance_speed.md

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/5_performance_speed.yml

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
name: My app is slow or missing frames
2+
description: |
3+
You are writing an application but have discovered that it is slow,
4+
you are not hitting 60Hz, or you are getting jank (missed frames).
5+
labels: 'from: performance template'
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: |
10+
Thank you for using Flutter!
11+
12+
If you are looking for support, please check out our documentation
13+
or consider asking a question on Stack Overflow:
14+
15+
- https://flutter.dev/
16+
- https://api.flutter.dev/
17+
- https://stackoverflow.com/questions/tagged/flutter?sort=frequent
18+
- type: textarea
19+
attributes:
20+
label: Steps to reproduce
21+
description: Please tell us exactly how to reproduce the problem you are running into.
22+
placeholder: |
23+
1. ...
24+
2. ...
25+
3. ...
26+
validations:
27+
required: true
28+
- type: textarea
29+
attributes:
30+
label: Code sample
31+
description: |
32+
Please create a minimal reproducible sample that shows the problem and attach it below between the lines with the backticks.
33+
34+
Try to reproduce the problem in a test app. Either run `flutter create janktest` and recreate the situation you are experiencing in that app, or clone your app and delete code until you have the jank reproducing with a single `.dart` file.
35+
36+
If you need more than just a `.dart` file (for example, assets are needed to reproduce the issue, or plugins/packages are needed to reproduce the issue) then create a GitHub repository and upload code there.
37+
38+
Without this we will unlikely be able to progress on the issue, and because of that we regretfully will have to close it.
39+
40+
Note: Please do not upload screenshots of text. Instead, use code blocks or the above mentioned ways to upload your code sample.
41+
value: |
42+
<details><summary>Code sample</summary>
43+
44+
```dart
45+
[Paste your code here]
46+
```
47+
48+
</details>
49+
validations:
50+
required: true
51+
- type: checkboxes
52+
attributes:
53+
label: Performance profiling on master channel
54+
description: |
55+
Switch flutter to master channel and run this app on a physical device using profile mode with Skia tracing enabled, as follows:
56+
```console
57+
flutter channel master
58+
flutter run --profile --trace-skia
59+
```
60+
The bleeding edge master channel is encouraged here because Flutter is constantly fixing bugs and improving its performance. Your problem in an older Flutter version may have already been solved in the master channel.
61+
options:
62+
- label: The issue still persists on the master channel
63+
required: true
64+
- type: textarea
65+
attributes:
66+
label: Timeline Traces
67+
description: |
68+
Open Flutter DevTools and save a timeline trace of the performance issue so we know which functions might be causing it. See "How to Collect and Read Timeline Traces" on this blog post: https://medium.com/flutter/profiling-flutter-applications-using-the-timeline-a1a434964af3#a499
69+
70+
Make sure the performance overlay is turned OFF when recording the trace as that may affect the performance of the profile run. (Pressing ‘P’ on the command line toggles the overlay.)
71+
72+
If the trace are too large to be uploaded to GitHub, you may upload them as a `zip` file or use online tools like https://pastebin.com to share it.
73+
value: |
74+
<details><summary>Timeline Traces JSON</summary>
75+
76+
```json
77+
[Paste the Timeline Traces here]
78+
```
79+
80+
</details>
81+
validations:
82+
required: true
83+
- type: textarea
84+
attributes:
85+
label: Video demonstration
86+
description: |
87+
Record a video of the performance issue using another phone so we can have an intuitive understanding of what happened.
88+
89+
Don’t use "adb screenrecord", as that affects the performance of the profile run.
90+
value: |
91+
<details>
92+
<summary>Video demonstration</summary>
93+
94+
[Upload media here]
95+
96+
</details>
97+
- type: dropdown
98+
id: target_platforms
99+
attributes:
100+
label: What target platforms are you seeing this bug on?
101+
multiple: true
102+
options:
103+
- Android
104+
- iOS
105+
- Web
106+
- macOS
107+
- Linux
108+
- Windows
109+
validations:
110+
required: true
111+
- type: textarea
112+
attributes:
113+
label: OS/Browser name and version | Device information
114+
description: |
115+
Which target OS version is the test system running? For Web, please provide browser version.
116+
Please also include the device information (model, CPU architecture, etc).
117+
validations:
118+
required: true
119+
- type: dropdown
120+
id: device-kind
121+
attributes:
122+
label: Does the problem occur on emulator/simulator as well as on physical devices?
123+
options:
124+
- "Unknown"
125+
- "Yes"
126+
- "No"
127+
validations:
128+
required: true
129+
- type: dropdown
130+
id: enable-impeller
131+
attributes:
132+
label: Is the problem only reproducible with Impeller?
133+
description: |
134+
Please check https://docs.flutter.dev/perf/impeller as the guideline on how to enable/disable it.
135+
options:
136+
- "N/A"
137+
- "Yes"
138+
- "No"
139+
validations:
140+
required: true
141+
- type: textarea
142+
attributes:
143+
label: Logs
144+
description: |
145+
Include the full logs of the commands you are running between the lines with the backticks below. If you are running any `flutter` commands, please include the output of running them with `--verbose`; for example, the output of running `flutter --verbose create foo`.
146+
147+
If the logs are too large to be uploaded to GitHub, you may upload them as a `txt` file or use online tools like https://pastebin.com to share it.
148+
149+
Note: Please do not upload screenshots of text. Instead, use code blocks or the above mentioned ways to upload logs.
150+
value: |
151+
<details><summary>Logs</summary>
152+
153+
```console
154+
[Paste your logs here]
155+
```
156+
157+
</details>
158+
- type: textarea
159+
attributes:
160+
label: Flutter Doctor output
161+
description: |
162+
Finally, paste the output of running `flutter doctor -v` here, with your device plugged in.
163+
value: |
164+
<details><summary>Doctor output</summary>
165+
166+
```console
167+
[Paste your output here]
168+
```
169+
170+
</details>
171+
validations:
172+
required: true

‎bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
45bc4307cda3f7af61915d5d7875d9ccb6bc637d
1+
5f82fc2f6f241f0beef0baf1d5336192b5c22a9a

‎bin/internal/flutter_packages.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bc8c2f20910bd3e70b1c16622b0d482ef73a0449
1+
d4e24542173774e2f9d78de8fd17d34713478bf4

‎bin/internal/fuchsia-linux.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MzLcTzBiWJ7o3Q2_ZoCskAyXV_qzdvkqbOC7R1VhrY8C
1+
aHtib4LBcLwx7JwK-pLiQPleFerXUt7If4yJSTh4tUcC

‎bin/internal/fuchsia-mac.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FF4r9-tqhioBbRG9fMFASuWfOKHBuLBdZtdnlvEPZY0C
1+
kGkqpvcPI1TGmR4Scp19EXK5hxyrDBhn2-hp4U8E6skC

‎dev/a11y_assessments/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1212
collection: 1.18.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1313
material_color_utilities: 0.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
14-
meta: 1.9.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
14+
meta: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1515
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1616
web: 0.1.4-beta # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1717

@@ -35,4 +35,4 @@ dev_dependencies:
3535
flutter:
3636
uses-material-design: true
3737

38-
# PUBSPEC CHECKSUM: b244
38+
# PUBSPEC CHECKSUM: 1e6b

‎dev/automated_tests/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
sdk: flutter
1313
integration_test:
1414
sdk: flutter
15-
platform: 3.1.1
15+
platform: 3.1.2
1616
test: 1.24.6
1717

1818
_fe_analyzer_shared: 64.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -37,7 +37,7 @@ dependencies:
3737
logging: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3838
matcher: 0.12.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3939
material_color_utilities: 0.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
40-
meta: 1.9.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
40+
meta: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4141
mime: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4242
node_preamble: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4343
package_config: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -64,12 +64,12 @@ dependencies:
6464
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6565
web: 0.1.4-beta # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6666
web_socket_channel: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
67-
webkit_inspection_protocol: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
67+
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6868
yaml: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6969

7070
flutter:
7171
uses-material-design: true
7272
assets:
7373
- icon/test.png
7474

75-
# PUBSPEC CHECKSUM: e054
75+
# PUBSPEC CHECKSUM: a37d

‎dev/benchmarks/complex_layout/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies:
2323
file: 6.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2424
matcher: 0.12.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2525
material_color_utilities: 0.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
26-
meta: 1.9.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
26+
meta: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2727
path: 1.8.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2828
source_span: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2929
stack_trace: 1.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,7 +74,7 @@ dev_dependencies:
7474
typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7575
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7676
web_socket_channel: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
77-
webkit_inspection_protocol: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
77+
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7878
yaml: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7979

8080
flutter:
@@ -83,4 +83,4 @@ flutter:
8383
- packages/flutter_gallery_assets/people/square/ali.png
8484
- packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
8585

86-
# PUBSPEC CHECKSUM: 0c2c
86+
# PUBSPEC CHECKSUM: 4654

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ Future<void> _dummyAsyncVoidCallback() async {}
8383
@sealed
8484
class Runner {
8585
/// Creates a runner for the [recorder].
86-
///
87-
/// All arguments must not be null.
8886
Runner({
8987
required this.recorder,
9088
this.setUpAllDidRun = _dummyAsyncVoidCallback,

‎dev/benchmarks/macrobenchmarks/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies:
2929
file: 6.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3030
matcher: 0.12.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3131
material_color_utilities: 0.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
32-
meta: 1.9.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
32+
meta: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3333
path: 1.8.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3434
source_span: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3535
stack_trace: 1.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -75,7 +75,7 @@ dev_dependencies:
7575
typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7676
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7777
web_socket_channel: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
78-
webkit_inspection_protocol: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
78+
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7979
yaml: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
8080

8181
flutter:
@@ -210,4 +210,4 @@ flutter:
210210
fonts:
211211
- asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf
212212

213-
# PUBSPEC CHECKSUM: 0c2c
213+
# PUBSPEC CHECKSUM: 4654

‎dev/benchmarks/microbenchmarks/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ environment:
55
sdk: '>=3.2.0-0 <4.0.0'
66

77
dependencies:
8-
meta: 1.9.1
8+
meta: 1.10.0
99
flutter:
1010
sdk: flutter
1111
flutter_test:
@@ -65,7 +65,7 @@ dependencies:
6565
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6666
web: 0.1.4-beta # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6767
web_socket_channel: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
68-
webkit_inspection_protocol: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
68+
webkit_inspection_protocol: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6969
yaml: 3.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7070

7171
flutter:
@@ -137,4 +137,4 @@ flutter:
137137
- packages/flutter_gallery_assets/people/square/stella.png
138138
- packages/flutter_gallery_assets/people/square/trevor.png
139139

140-
# PUBSPEC CHECKSUM: 5ca3
140+
# PUBSPEC CHECKSUM: 46cb

0 commit comments

Comments
 (0)