Skip to content

Commit a4a49eb

Browse files
zijiehe-google-comzijiehe-google-com
authored
Merge branch 'master' into master
2 parents ca9e50e + d6c0d6f commit a4a49eb

35 files changed

+1230
-72
lines changed

‎.ci.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,6 +1589,29 @@ targets:
15891589
- engine/**
15901590
- DEPS
15911591

1592+
- name: Linux tool_tests_widget_preview_scaffold
1593+
recipe: flutter/flutter_drone
1594+
timeout: 60
1595+
bringup: true
1596+
properties:
1597+
add_recipes_cq: "true"
1598+
dependencies: >-
1599+
[
1600+
{"dependency": "android_sdk", "version": "version:35v1"},
1601+
{"dependency": "open_jdk", "version": "version:21"}
1602+
]
1603+
shard: tool_tests
1604+
subshard: widget_preview_scaffold
1605+
tags: >
1606+
["framework", "hostonly", "shard", "linux"]
1607+
runIf:
1608+
- dev/**
1609+
- packages/flutter_tools/**
1610+
- bin/**
1611+
- .ci.yaml
1612+
- engine/**
1613+
- DEPS
1614+
15921615
- name: Linux_android_emu android_engine_vulkan_tests
15931616
recipe: flutter/flutter_drone
15941617
timeout: 60

‎DEPS‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '5f65df75febd647dbe709809d7a86c6b5dcace86',
17+
'skia_revision': 'a7da13848085143e730dc3ea946ba8b4d2176ea2',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,21 +56,21 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': 'd174ec16c3eabc271d553d7fed29a106cafbd8df',
59+
'dart_revision': '87965ab4864e444c521023820eb06e569d007059',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6363
'dart_binaryen_rev': 'b4bdcc33115b31758c56b83bb9de4642c411a042',
6464
'dart_boringssl_rev': 'e68438b863afaa3e81e1771b91819817780f3b60',
65-
'dart_core_rev': 'a6e81e0b74faf12ed4a938fa9a8ddba86b89b73d',
65+
'dart_core_rev': '7a80178ca72b01b0efb99a9a9a654d83ca21d6b7',
6666
'dart_devtools_rev': 'f10e8df8c517fb0412b9a66c626581867c9c267d',
6767
'dart_ecosystem_rev': '391a80ccb774cfebe4865bcd7e933d1ab016eea5',
68-
'dart_http_rev': 'e988925d81eb85736b12a3e50e78ea1d10bc98bc',
69-
'dart_i18n_rev': '2701040426aada5af6022ee0737f7bfadd7de178',
68+
'dart_http_rev': '32d5ffcc8d0d5ce9a3a76a293230fa70ec2cc88f',
69+
'dart_i18n_rev': 'de1943629469719bf34269bf90fcdbe9334a73f3',
7070
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7171
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
73-
'dart_protobuf_rev': 'cf4f3a8d68f713b32eb03261ab3a72bb6910147b',
73+
'dart_protobuf_rev': '1aaa332af75c61ff32739821f7ec52186ff18d4c',
7474
'dart_pub_rev': 'b2c03b448a47fdd52800609b9222cd737be3a934',
7575
'dart_sync_http_rev': 'dc54465f07d9652875deeade643256dafa2fbc6c',
7676
'dart_tools_rev': '62bc13bc086a66ce9a6a3e64865c82d17a1379b3',
@@ -317,7 +317,7 @@ deps = {
317317
Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
318318

319319
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
320-
Var('dart_git') + '/dartdoc.git@cbc18857befc411c32c1720c2a3c57dade1d96bd',
320+
Var('dart_git') + '/dartdoc.git@62aefbb788baf5b73b2d704d66d9735a7ca56a69',
321321

322322
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
323323
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),

‎bin/internal/flutter_packages.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4a36dc63f7197f5cf4f0d0b9b670492b8848c502
1+
267ac7b66308ad34b6ce14c1f5399ab0691f9ede

‎dev/bots/test.dart‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,17 @@ Future<void> _runIntegrationToolTests() async {
236236
);
237237
}
238238

239+
Future<void> _runWidgetPreviewScaffoldToolTests() async {
240+
await runFlutterTest(
241+
path.join(_toolsPath, 'test', 'widget_preview_scaffold.shard', 'widget_preview_scaffold'),
242+
);
243+
}
244+
239245
Future<void> _runToolTests() async {
240246
await selectSubshard(<String, ShardRunner>{
241247
'general': _runGeneralToolTests,
242248
'commands': _runCommandsToolTests,
249+
'widget_preview_scaffold': _runWidgetPreviewScaffoldToolTests,
243250
});
244251
}
245252

‎engine/src/flutter/.ci.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,6 @@ targets:
384384
cores: "8"
385385

386386
- name: Linux linux_web_engine_tests
387-
bringup: true # https://github.com/flutter/flutter/issues/165610 - Ubuntu 24.04 + Firefox
388387
recipe: engine_v2/engine_v2
389388
timeout: 120
390389
properties:

‎engine/src/flutter/ci/builders/linux_android_aot_engine_ddm.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,52 @@
6464
]
6565
}
6666
]
67+
},
68+
{
69+
"archives": [
70+
{
71+
"name": "ci/android_release_x64_ddm",
72+
"type": "gcs",
73+
"base_path": "out/ci/android_release_x64_ddm/zip_archives/",
74+
"include_paths": [
75+
"out/ci/android_release_x64_ddm/zip_archives/android-x64-release-ddm/artifacts.zip",
76+
"out/ci/android_release_x64_ddm/zip_archives/android-x64-release-ddm/linux-x64.zip",
77+
"out/ci/android_release_x64_ddm/zip_archives/android-x64-release-ddm/symbols.zip",
78+
"out/ci/android_release_x64_ddm/zip_archives/android-x64-release-ddm/analyze-snapshot-linux-x64.zip"
79+
],
80+
"realm": "production"
81+
}
82+
],
83+
"drone_dimensions": [
84+
"device_type=none",
85+
"os=Linux"
86+
],
87+
"gclient_variables": {
88+
"use_rbe": true
89+
},
90+
"gn": [
91+
"--target-dir",
92+
"ci/android_release_x64_ddm",
93+
"--runtime-mode",
94+
"release",
95+
"--android",
96+
"--android-cpu",
97+
"x64",
98+
"--no-prebuilt-dart-sdk",
99+
"--gn-args=dart_dynamic_modules=true",
100+
"--rbe",
101+
"--no-goma"
102+
],
103+
"name": "ci/android_release_x64_ddm",
104+
"description": "Produces experimental release mode artifacts to target x64 Android from a Linux host with dynamic modules enabled.",
105+
"ninja": {
106+
"config": "ci/android_release_x64_ddm",
107+
"targets": [
108+
"default",
109+
"clang_x64/gen_snapshot",
110+
"flutter/shell/platform/android:analyze_snapshot"
111+
]
112+
}
67113
}
68114
],
69115
"generators": {

‎engine/src/flutter/ci/builders/linux_android_debug_engine_ddm.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,46 @@
4747
"flutter"
4848
]
4949
}
50+
},
51+
{
52+
"archives": [
53+
{
54+
"name": "ci/android_debug_x64_ddm",
55+
"type": "gcs",
56+
"base_path": "out/ci/android_debug_x64_ddm/zip_archives/",
57+
"include_paths": [
58+
"out/ci/android_debug_x64_ddm/zip_archives/android-x64-ddm/artifacts.zip",
59+
"out/ci/android_debug_x64_ddm/zip_archives/android-x64-ddm/symbols.zip"
60+
],
61+
"realm": "production"
62+
}
63+
],
64+
"drone_dimensions": [
65+
"device_type=none",
66+
"os=Linux"
67+
],
68+
"gclient_variables": {
69+
"use_rbe": true
70+
},
71+
"gn": [
72+
"--target-dir",
73+
"ci/android_debug_x64_ddm",
74+
"--android",
75+
"--android-cpu=x64",
76+
"--no-lto",
77+
"--no-prebuilt-dart-sdk",
78+
"--gn-args=dart_dynamic_modules=true",
79+
"--rbe",
80+
"--no-goma"
81+
],
82+
"name": "ci/android_debug_x64_ddm",
83+
"description": "Produces experimental debug mode artifacts to target x64 Android from a Linux host with dynamic modules enabled.",
84+
"ninja": {
85+
"config": "ci/android_debug_x64_ddm",
86+
"targets": [
87+
"flutter"
88+
]
89+
}
5090
}
5191
],
5292
"generators": {

‎engine/src/flutter/ci/licenses_golden/licenses_dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 9d6e8b6729d41efa494443d2b64cbe67
1+
Signature: 7582ce3fcdf2e515db0132d7c32bf1b3
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4862,7 +4862,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
48624862
This Source Code Form is "Incompatible With Secondary Licenses", as
48634863
defined by the Mozilla Public License, v. 2.0.
48644864

4865-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/72562ca93bb5672410da528743fb2f92e025bb95
4865+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4293d50dd30d5469fac05af7470148977327bbe8
48664866
/third_party/fallback_root_certificates/
48674867

48684868
====================================================================================================

‎engine/src/flutter/ci/licenses_golden/licenses_skia‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f0de34e3335028051e2d3a6034d45ddc
1+
Signature: 829087a3eb9aa27cf73d52f8da650a17
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -400,6 +400,7 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
400400
FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
401401
FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
402402
FILE: ../../../flutter/third_party/skia/package-lock.json
403+
FILE: ../../../flutter/third_party/skia/relnotes/recorder-ordering-override.md
403404
FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
404405
FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
405406
FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl

‎engine/src/flutter/lib/web_ui/test/engine/image_to_byte_data_test.dart‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,38 @@ void main() {
1616
}
1717

1818
Future<void> testMain() async {
19-
setUpUnitTests();
20-
21-
Future<Image> createTestImageByColor(Color color) async {
22-
final PictureRecorder recorder = PictureRecorder();
23-
final Canvas canvas = Canvas(recorder, const Rect.fromLTRB(0, 0, 2, 2));
24-
canvas.drawColor(color, BlendMode.srcOver);
25-
final Picture testPicture = recorder.endRecording();
26-
final Image testImage = await testPicture.toImage(2, 2);
27-
return testImage;
28-
}
29-
30-
test('Picture.toImage().toByteData()', () async {
31-
final Image testImage = await createTestImageByColor(const Color(0xFFCCDD00));
32-
33-
final ByteData bytes = (await testImage.toByteData())!;
34-
expect(bytes.buffer.asUint32List(), <int>[0xFF00DDCC, 0xFF00DDCC, 0xFF00DDCC, 0xFF00DDCC]);
35-
36-
final ByteData pngBytes = (await testImage.toByteData(format: ImageByteFormat.png))!;
37-
38-
// PNG-encoding is browser-specific, but the header is standard. We only
39-
// test the header.
40-
final List<int> pngHeader = <int>[137, 80, 78, 71, 13, 10, 26, 10];
41-
expect(pngBytes.buffer.asUint8List().sublist(0, pngHeader.length), pngHeader);
42-
43-
// Firefox does not support WebGL in headless mode.
44-
}, skip: isFirefox);
45-
46-
test('Image.toByteData(format: ImageByteFormat.rawStraightRgba)', () async {
47-
final Image testImage = await createTestImageByColor(const Color(0xAAFFFF00));
48-
49-
final ByteData bytes = (await testImage.toByteData(format: ImageByteFormat.rawStraightRgba))!;
50-
expect(bytes.buffer.asUint32List(), <int>[0xAA00FFFF, 0xAA00FFFF, 0xAA00FFFF, 0xAA00FFFF]);
51-
19+
group('toByteData test', () {
20+
setUpUnitTests();
21+
22+
Future<Image> createTestImageByColor(Color color) async {
23+
final PictureRecorder recorder = PictureRecorder();
24+
final Canvas canvas = Canvas(recorder, const Rect.fromLTRB(0, 0, 2, 2));
25+
canvas.drawColor(color, BlendMode.srcOver);
26+
final Picture testPicture = recorder.endRecording();
27+
final Image testImage = await testPicture.toImage(2, 2);
28+
return testImage;
29+
}
30+
31+
test('Picture.toImage().toByteData()', () async {
32+
final Image testImage = await createTestImageByColor(const Color(0xFFCCDD00));
33+
34+
final ByteData bytes = (await testImage.toByteData())!;
35+
expect(bytes.buffer.asUint32List(), <int>[0xFF00DDCC, 0xFF00DDCC, 0xFF00DDCC, 0xFF00DDCC]);
36+
37+
final ByteData pngBytes = (await testImage.toByteData(format: ImageByteFormat.png))!;
38+
39+
// PNG-encoding is browser-specific, but the header is standard. We only
40+
// test the header.
41+
final List<int> pngHeader = <int>[137, 80, 78, 71, 13, 10, 26, 10];
42+
expect(pngBytes.buffer.asUint8List().sublist(0, pngHeader.length), pngHeader);
43+
});
44+
45+
test('Image.toByteData(format: ImageByteFormat.rawStraightRgba)', () async {
46+
final Image testImage = await createTestImageByColor(const Color(0xAAFFFF00));
47+
48+
final ByteData bytes = (await testImage.toByteData(format: ImageByteFormat.rawStraightRgba))!;
49+
expect(bytes.buffer.asUint32List(), <int>[0xAA00FFFF, 0xAA00FFFF, 0xAA00FFFF, 0xAA00FFFF]);
50+
});
5251
// Firefox does not support WebGL in headless mode.
5352
}, skip: isFirefox);
5453
}

0 commit comments

Comments
 (0)