Skip to content

Commit 7ac0d23

Browse files
LouiseHsuLouiseHsu
authored
Merge branch 'master' into translation-redux-engine
2 parents 728e2d3 + 222295b commit 7ac0d23

285 files changed

Lines changed: 9079 additions & 3935 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: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7280,6 +7280,21 @@ targets:
72807280
]
72817281
task_name: windows_desktop_impeller
72827282

7283+
- name: Windows windows_primitive_shape_golden_test
7284+
recipe: devicelab/devicelab_drone
7285+
presubmit: false
7286+
bringup: true
7287+
timeout: 60
7288+
properties:
7289+
tags: >
7290+
["devicelab", "hostonly", "windows"]
7291+
dependencies: >-
7292+
[
7293+
{"dependency": "vs_build", "version": "version:vs2019"},
7294+
{"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
7295+
]
7296+
task_name: windows_primitive_shape_golden_test
7297+
72837298
- name: Windows texture_impeller_windows
72847299
recipe: devicelab/devicelab_drone
72857300
presubmit: false

‎.github/ISSUE_TEMPLATE/09_feature.yml‎

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

‎.github/ISSUE_TEMPLATE/09_wasm.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Report a Flutter WebAssembly (Wasm) issue
2+
description: |
3+
You hit a compilation, packaging, or runtime blocker while targeting WebAssembly (Wasm) in Flutter Web.
4+
labels: ['platform-web', 'e: wasm']
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thank you for testing Flutter Web with WebAssembly! 🚀
10+
Please provide relevant build logs, browser details, and package dependencies so engineering leads can rapidly triage your issue.
11+
- type: textarea
12+
id: build_command_output
13+
attributes:
14+
label: Build Command & Compile Logs
15+
description: |
16+
Paste the exact build command (e.g., `flutter build web --wasm`) and any resulting terminal errors or stack traces. **Note: If reporting a runtime bug where compilation succeeded cleanly, simply list your build command without full terminal output.**
17+
placeholder: |
18+
$ flutter build web --wasm
19+
Target wasm_module failed: ...
20+
render: shell
21+
validations:
22+
required: true
23+
- type: input
24+
id: browser_version
25+
attributes:
26+
label: Target Browser & Version
27+
description: Specify the browser and version where the Wasm runtime or visual bug occurred (e.g., Chrome 145.0.0.0, Safari 18.2). **Optional if reporting a compilation or build failure.**
28+
placeholder: Chrome 145.0
29+
validations:
30+
required: false
31+
- type: textarea
32+
id: blocking_packages
33+
attributes:
34+
label: Blocking Packages / Dependencies
35+
description: |
36+
List any third-party packages from your `pubspec.yaml` causing Wasm compilation failures or missing FFI bindings. Leave blank if standard SDK code.
37+
placeholder: |
38+
package:sqlite3_web 2.1.0
39+
package:js_bindings 1.4.2
40+
validations:
41+
required: false
42+
- type: textarea
43+
id: reproduction_steps
44+
attributes:
45+
label: Steps to reproduce & Actual Behavior
46+
description: Provide specific code snippets or minimal reproduction steps describing what went wrong versus expected results. If reporting a runtime exception, include console DevTools stack traces here.
47+
placeholder: |
48+
1. Create default demo app with `--wasm` flag.
49+
2. Import package X and call `init()`.
50+
3. Observe console exception in browser DevTools.
51+
validations:
52+
required: true
53+
- type: textarea
54+
id: flutter_doctor
55+
attributes:
56+
label: Flutter Doctor Output
57+
description: Paste the complete output of `flutter doctor -v` from your local terminal.
58+
render: shell
59+
validations:
60+
required: true

‎DEPS‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
vars = {
1111
'android_git': 'https://android.googlesource.com',
1212
'chromium_git': 'https://chromium.googlesource.com',
13-
'swiftshader_git': 'https://swiftshader.googlesource.com',
1413
'dart_git': 'https://dart.googlesource.com',
1514
'flutter_git': 'https://flutter.googlesource.com',
1615
'skia_git': 'https://skia.googlesource.com',
1716
'llvm_git': 'https://llvm.googlesource.com',
1817
'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
19-
'skia_revision': '50cf67910462acc1e5b6474d0ec9d5f35e44c54c',
18+
'skia_revision': 'a8583a0a2c114130cd88d7fbca23248d50a91946',
2019

2120
# Do not download the Emscripten SDK by default.
2221
# This prevents us from downloading the Emscripten toolchain for builds
@@ -56,24 +55,24 @@ vars = {
5655
# updated revision list of existing dependencies. You will need to
5756
# gclient sync before and after update deps to ensure all deps are updated.
5857
# updated revision list of existing dependencies.
59-
'dart_revision': '43f7de5f49777afc803a8fe69a752d3550f0602f',
58+
'dart_revision': '9859c0a39adb1c418b0831dde11a338f7e1f7ed0',
6059

6160
# WARNING: DO NOT EDIT MANUALLY
6261
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6362
'dart_binaryen_rev': '9926156a583cec3d22d521232b31c70fa9a87dc1',
64-
'dart_boringssl_rev': '22a0079b189c391b95689813a41982ce11876f0a',
65-
'dart_core_rev': 'be0b1531c445a185d3e93887b8d0355fc766c314',
66-
'dart_devtools_rev': '12d595649f189f1896722623f72599077f476848',
67-
'dart_ecosystem_rev': '848b3bf3b757d2e9ae4d60030eeed5756c87783f',
63+
'dart_boringssl_rev': 'f1f2556a5dfa59e147d9d47279cc3f7f8a18b433',
64+
'dart_core_rev': 'fe516ee1b38cc60e7a8c6e082c337037a043d782',
65+
'dart_devtools_rev': '21f1838f3a9b138ac377efb953ca5a53c8832e75',
66+
'dart_ecosystem_rev': 'edfdb3b4063b9034b708144633a700204f865f43',
6867
'dart_http_rev': '5d94ef52582867e077bf41c3fa20fb8b1d1d834e',
69-
'dart_i18n_rev': 'd0683bdea253d19a4350f5bc2be9017aba61837f',
68+
'dart_i18n_rev': 'e1b5a798f8922bb27bbc6d858748ece6f9a19f02',
7069
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7170
'dart_protobuf_rev': '91efb90f437bb6a30e6726c3369a2fcb9bba06e7',
7271
'dart_pub_rev': 'ec276d10a7fa0f6c6ec005340fb9ad29f3b012d0',
7372
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
74-
'dart_tools_rev': '3f850c4fd27c3a19abd91889a8261e0bf2fd1663',
73+
'dart_tools_rev': 'b827a6e38b934232c7f7b8728a5aef6165e7df2d',
7574
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
76-
'dart_web_rev': 'eb8c3fc61a1e35f48f865836c7c7342897d91bcc',
75+
'dart_web_rev': '12a9ca2ebc08f5a6f2d69aebc7daa1f5a2e6a431',
7776
'dart_webdriver_rev': '3a711ebb36871eac997c5d5d2429f7414873dc63',
7877
'dart_webkit_inspection_protocol_rev': '762115a971d1968bc940454ad1e88d506d8c5640',
7978

@@ -186,7 +185,6 @@ vars = {
186185
"upstream_shelf": "https://github.com/dart-lang/shelf.git",
187186
"upstream_skia": "https://skia.googlesource.com/skia.git",
188187
"upstream_sqlite": "https://github.com/sqlite/sqlite.git",
189-
"upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
190188
"upstream_tar": "https://github.com/simolus3/tar.git",
191189
"upstream_test": "https://github.com/dart-lang/test.git",
192190
"upstream_usage": "https://github.com/dart-lang/usage.git",
@@ -201,7 +199,7 @@ vars = {
201199
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
202200
# will be used altogether with fuchsia-sdk to setup the build / test
203201
# environment.
204-
'fuchsia_test_scripts_version': '1frGe_KltAJKkeyPgy4cDJqScCYVYSpC9sJfjflcvl4C',
202+
'fuchsia_test_scripts_version': 'ltbuIH9Z3T_yOuiguCVHKgUR4YOTjj87kcx20LvoNkgC',
205203

206204
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
207205
# used altogether with fuchsia-sdk to generate gn based build rules.
@@ -224,7 +222,6 @@ allowed_hosts = [
224222
'flutter.googlesource.com',
225223
'llvm.googlesource.com',
226224
'skia.googlesource.com',
227-
'swiftshader.googlesource.com',
228225
]
229226

230227
deps = {
@@ -330,7 +327,7 @@ deps = {
330327
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
331328

332329
'engine/src/flutter/third_party/dart/third_party/devtools':
333-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:12d595649f189f1896722623f72599077f476848'}]},
330+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:21f1838f3a9b138ac377efb953ca5a53c8832e75'}]},
334331

335332
'engine/src/flutter/third_party/dart/third_party/perfetto/src':
336333
Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
@@ -342,7 +339,7 @@ deps = {
342339
Var('dart_git') + '/dart_style.git@dfdf6420c7ea923d28edef3f11e89b4ff23d03bf',
343340

344341
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
345-
Var('dart_git') + '/dartdoc.git@1d56f263955f329b6701d8f84f069eb0aef353a4',
342+
Var('dart_git') + '/dartdoc.git@ac96918074974dcd4ea20f764f17090f58c1e428',
346343

347344
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
348345
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -366,7 +363,7 @@ deps = {
366363
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
367364

368365
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
369-
Var('dart_git') + '/shelf.git@71248e727317930f244c4b4535e9733bcfc66677',
366+
Var('dart_git') + '/shelf.git@6918a7690946044b4098e9f6735439044c676e13',
370367

371368
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
372369
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -393,7 +390,7 @@ deps = {
393390
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
394391

395392
'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
396-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.13.0-272.0.dev'}]},
393+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.14.0-75.0.dev'}]},
397394

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

@@ -544,7 +541,7 @@ deps = {
544541
Var('flutter_git') + '/third_party/pyyaml.git' + '@' + '03c67afd452cdff45b41bfe65e19a2fb5b80a0e8',
545542

546543
'engine/src/flutter/third_party/swiftshader':
547-
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '794b0cfce1d828d187637e6d932bae484fbe0976',
544+
Var('flutter_git') + '/third_party/swiftshader.git' + '@' + '1be9f83618f8ba258431c0c13d7a083eb193df11',
548545

549546
'engine/src/flutter/third_party/angle':
550547
Var('flutter_git') + '/third_party/angle' + '@' + 'cc08479fbcc181697fa837069ce1103c58c15528',

‎TESTOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
/dev/devicelab/bin/tasks/windowing_test_windows.dart @mattkae @flutter/desktop
333333
/dev/devicelab/bin/tasks/windows_desktop_impeller.dart @jonahwilliams @flutter/engine
334334
/dev/devicelab/bin/tasks/windows_home_scroll_perf__timeline_summary.dart @jonahwilliams @flutter/engine
335+
/dev/devicelab/bin/tasks/windows_primitive_shape_golden_test.dart @b-luk @flutter/engine
335336
/dev/devicelab/bin/tasks/windows_startup_test.dart @loic-sharma @flutter/desktop
336337

337338
## Host only framework tests

‎bin/internal/flutter_packages.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7d17fc869daf572994367a750c626817a506d667
1+
3498b9d7b67143a68dc43b90951acb577e92f64e

‎bin/internal/update_dart_sdk.ps1‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,16 @@ if ($engineRealm) {
4949

5050
# It's important to use the native Dart SDK as the default target architecture
5151
# for Flutter Windows builds depend on the Dart executable's architecture.
52+
# FLUTTER_HOST_ARCH can be set as an override to force download for the specified architecture.
53+
# PROCESSOR_ARCHITECTURE is a standard Windows env var indicating host CPU architecture.
5254
$dartZipNameX64 = "dart-sdk-windows-x64.zip"
5355
$dartZipNameArm64 = "dart-sdk-windows-arm64.zip"
5456
$dartZipName = $dartZipNameX64
55-
if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
57+
if ($env:FLUTTER_HOST_ARCH -eq "arm64") {
58+
$dartZipName = $dartZipNameArm64
59+
} elseif ($env:FLUTTER_HOST_ARCH -eq "x64") {
60+
$dartZipName = $dartZipNameX64
61+
} elseif ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
5662
$dartSdkArm64Url = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipNameArm64"
5763
Try {
5864
Invoke-WebRequest -Uri $dartSdkArm64Url -UseBasicParsing -Method Head | Out-Null

‎bin/internal/update_dart_sdk.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != "$(< "$ENGINE_STAMP")" ];
6161
exit 1
6262
}
6363

64-
# `uname -m` may be running in Rosetta mode, instead query sysctl
65-
if [ "$OS" = 'Darwin' ]; then
64+
if [ -n "$FLUTTER_HOST_ARCH" ]; then
65+
# FLUTTER_HOST_ARCH can be set to override the host architecture detection.
66+
ARCH="$FLUTTER_HOST_ARCH"
67+
elif [ "$OS" = 'Darwin' ]; then
68+
# `uname -m` may be running in Rosetta mode, instead query sysctl
6669
# Allow non-zero exit so we can do control flow
6770
set +e
6871
# -n means only print value, not key

‎dev/bots/check_examples_cross_imports.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,6 @@ class ExamplesCrossImportChecker {
585585
'examples/multiple_windows/lib/app/window_settings_dialog.dart',
586586
'examples/multiple_windows/lib/main.dart',
587587
'examples/multiple_windows/test/multiple_windows_test.dart',
588-
'examples/platform_channel/lib/main.dart',
589-
'examples/platform_channel_swift/lib/main.dart',
590588
'examples/platform_view/lib/main.dart',
591589
'examples/splash/lib/main.dart',
592590
'examples/splash/test/splash_test.dart',

0 commit comments

Comments
 (0)