Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 079d1ad

Browse filesBrowse files
mosuemmosuem
authored
Merge branch 'master' into rebaseMartinsDataAssets
2 parents 1feb1f7 + d42a974 commit 079d1ad
Copy full SHA for 079d1ad

File tree

Expand file treeCollapse file tree

159 files changed

+2455
-1384
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

159 files changed

+2455
-1384
lines changed

‎.ci.yaml

Copy file name to clipboardExpand all lines: .ci.yaml
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,6 @@ platform_properties:
252252
os: Mac-13|Mac-14
253253
cpu: x86
254254
device_type: "mokey"
255-
$flutter/osx_sdk : >-
256-
{
257-
"skip_xcode_install": true
258-
}
259255
mac_arm64_mokey:
260256
properties:
261257
dependencies: >-
@@ -266,10 +262,6 @@ platform_properties:
266262
os: Mac-13|Mac-14
267263
cpu: arm64
268264
device_type: "mokey"
269-
$flutter/osx_sdk : >-
270-
{
271-
"skip_xcode_install": true
272-
}
273265

274266
mac_pixel_7pro:
275267
properties:

‎DEPS

Copy file name to clipboardExpand all lines: DEPS
+6-6Lines changed: 6 additions & 6 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': '16f8a49764f48870213e21a4068f121c0c98368f',
17+
'skia_revision': '7e4323f72c9d381f608bfe467af06a2ed83923d7',
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,12 +56,12 @@ 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': 'b8292dfeaa67cd79e9dbbec71d3bd2daf6720568',
59+
'dart_revision': 'd70b123c77d4115f332652c9bb21ac46a2456889',
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': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
64-
'dart_boringssl_rev': '0c59e9e55bdaadadf49f3c092b097e72cd4b39cc',
64+
'dart_boringssl_rev': 'daa03aac8d88f67c8b8d293ebc11d57f61ca6f8a',
6565
'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
6666
'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
6767
'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
@@ -310,7 +310,7 @@ deps = {
310310
Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535',
311311

312312
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
313-
Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62',
313+
Var('dart_git') + '/dartdoc.git@34561d6ebf5fa89ca1f93b981de96a75ff573562',
314314

315315
'engine/src/flutter/third_party/dart/third_party/pkg/http':
316316
Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
@@ -337,7 +337,7 @@ deps = {
337337
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
338338

339339
'engine/src/flutter/third_party/dart/third_party/pkg/test':
340-
Var('dart_git') + '/test.git@17609bf90c9d5ef47707f5796763629450382474',
340+
Var('dart_git') + '/test.git@a833663e56b6182f8372180f5c95d1c01b531150',
341341

342342
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
343343
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -794,7 +794,7 @@ deps = {
794794
'packages': [
795795
{
796796
'package': 'fuchsia/sdk/core/linux-amd64',
797-
'version': 'Rt6pxGFLVAJHduM0Vsa-qFoeZUvIO98bmhVU2Ylo9z0C'
797+
'version': 'fhm5z889sA5T1AQaoJiq4JUMUWqhuR19rofl2c4Yc1UC'
798798
}
799799
],
800800
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎dev/integration_tests/android_engine_test/lib/hcpp/platform_view_clippath_main.dart

Copy file name to clipboard
+174Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import 'dart:convert';
6+
7+
import 'package:android_driver_extensions/extension.dart';
8+
import 'package:flutter/foundation.dart';
9+
import 'package:flutter/gestures.dart';
10+
import 'package:flutter/material.dart';
11+
import 'package:flutter/rendering.dart';
12+
import 'package:flutter/services.dart';
13+
import 'package:flutter_driver/driver_extension.dart';
14+
15+
import '../src/allow_list_devices.dart';
16+
17+
void main() async {
18+
ensureAndroidDevice();
19+
enableFlutterDriverExtension(
20+
handler: (String? command) async {
21+
return json.encode(<String, Object?>{
22+
'supported': await HybridAndroidViewController.checkIfSupported(),
23+
});
24+
},
25+
commands: <CommandExtension>[nativeDriverCommands],
26+
);
27+
28+
// Run on full screen.
29+
await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
30+
runApp(const _ComplicatedClipPathWrappedMainApp());
31+
}
32+
33+
final class _ComplicatedClipPathWrappedMainApp extends StatefulWidget {
34+
const _ComplicatedClipPathWrappedMainApp();
35+
36+
@override
37+
State<_ComplicatedClipPathWrappedMainApp> createState() {
38+
return _ComplicatedClipPathWrappedMainAppState();
39+
}
40+
}
41+
42+
class _ComplicatedClipPathWrappedMainAppState extends State<_ComplicatedClipPathWrappedMainApp> {
43+
final CustomClipper<Path> _triangleClipper = TriangleClipper();
44+
CustomClipper<Path>? _triangleOrEmpty = TriangleClipper();
45+
46+
void _toggleTriangleClipper() {
47+
setState(() {
48+
if (_triangleOrEmpty == null) {
49+
_triangleOrEmpty = _triangleClipper;
50+
} else {
51+
_triangleOrEmpty = null;
52+
}
53+
});
54+
}
55+
56+
@override
57+
Widget build(BuildContext context) {
58+
return MaterialApp(
59+
home: ClipPath(
60+
clipper: _triangleOrEmpty,
61+
child: ClipPath(
62+
clipper: CubicWaveClipper(),
63+
child: ClipOval(
64+
child: Stack(
65+
alignment: Alignment.center,
66+
children: <Widget>[
67+
TextButton(
68+
key: const ValueKey<String>('ToggleTriangleClipping'),
69+
onPressed: _toggleTriangleClipper,
70+
child: const SizedBox(
71+
width: 500,
72+
height: 500,
73+
child: ColoredBox(color: Colors.green),
74+
),
75+
),
76+
const SizedBox(
77+
width: 400,
78+
height: 400,
79+
child: _HybridCompositionAndroidPlatformView(
80+
viewType: 'changing_color_button_platform_view',
81+
),
82+
),
83+
],
84+
),
85+
),
86+
),
87+
),
88+
);
89+
}
90+
}
91+
92+
// Clips to show the top half of the screen, with a cubic wave as the dividing
93+
// line.
94+
class CubicWaveClipper extends CustomClipper<Path> {
95+
@override
96+
Path getClip(Size size) {
97+
final Path path = Path();
98+
// Closer to 1 moves the wave lower, closer to 0 moves it higher.
99+
final double waveHeight = size.height * 0.65;
100+
101+
path.lineTo(0, waveHeight);
102+
103+
path.cubicTo(
104+
size.width * 0.25,
105+
waveHeight * 0.8,
106+
size.width * 0.75,
107+
waveHeight * 1.2,
108+
size.width,
109+
waveHeight,
110+
);
111+
112+
path.lineTo(size.width, 0);
113+
path.lineTo(0, 0);
114+
115+
path.close();
116+
return path;
117+
}
118+
119+
@override
120+
bool shouldReclip(CustomClipper<Path> oldClipper) {
121+
return false;
122+
}
123+
}
124+
125+
// Clips a triangle off the top left of the screen.
126+
class TriangleClipper extends CustomClipper<Path> {
127+
@override
128+
Path getClip(Size size) {
129+
final Path path = Path();
130+
path.lineTo(0, size.height);
131+
path.lineTo(size.width, size.height);
132+
path.lineTo(size.width, 0);
133+
path.lineTo(size.width / 2, 0);
134+
path.lineTo(0, size.height / 2);
135+
path.lineTo(0, size.height);
136+
path.close();
137+
return path;
138+
}
139+
140+
@override
141+
bool shouldReclip(CustomClipper<Path> oldClipper) {
142+
return false;
143+
}
144+
}
145+
146+
final class _HybridCompositionAndroidPlatformView extends StatelessWidget {
147+
const _HybridCompositionAndroidPlatformView({required this.viewType});
148+
149+
final String viewType;
150+
151+
@override
152+
Widget build(BuildContext context) {
153+
return PlatformViewLink(
154+
viewType: viewType,
155+
surfaceFactory: (BuildContext context, PlatformViewController controller) {
156+
return AndroidViewSurface(
157+
controller: controller as AndroidViewController,
158+
gestureRecognizers: const <Factory<OneSequenceGestureRecognizer>>{},
159+
hitTestBehavior: PlatformViewHitTestBehavior.transparent,
160+
);
161+
},
162+
onCreatePlatformView: (PlatformViewCreationParams params) {
163+
return PlatformViewsService.initHybridAndroidView(
164+
id: params.id,
165+
viewType: viewType,
166+
layoutDirection: TextDirection.ltr,
167+
creationParamsCodec: const StandardMessageCodec(),
168+
)
169+
..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
170+
..create();
171+
},
172+
);
173+
}
174+
}

‎dev/integration_tests/android_engine_test/test_driver/hcpp/platform_view_clippath_main_test.dart

Copy file name to clipboard
+77Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import 'dart:convert';
6+
7+
import 'package:android_driver_extensions/native_driver.dart';
8+
import 'package:android_driver_extensions/skia_gold.dart';
9+
import 'package:flutter_driver/flutter_driver.dart';
10+
import 'package:test/test.dart';
11+
12+
import '../_luci_skia_gold_prelude.dart';
13+
14+
/// For local debugging, a (local) golden-file is required as a baseline:
15+
///
16+
/// ```sh
17+
/// # Checkout HEAD, i.e. *before* changes you want to test.
18+
/// UPDATE_GOLDENS=1 flutter drive lib/hcpp/platform_view_clippath_main.dart
19+
///
20+
/// # Make your changes.
21+
///
22+
/// # Run the test against baseline.
23+
/// flutter drive lib/hcpp/platform_view_clippath_main.dart
24+
/// ```
25+
///
26+
/// For a convenient way to deflake a test, see `tool/deflake.dart`.
27+
void main() async {
28+
const String goldenPrefix = 'hybrid_composition_pp_platform_view';
29+
30+
late final FlutterDriver flutterDriver;
31+
late final NativeDriver nativeDriver;
32+
33+
setUpAll(() async {
34+
if (isLuci) {
35+
await enableSkiaGoldComparator(namePrefix: 'android_engine_test$goldenVariant');
36+
}
37+
flutterDriver = await FlutterDriver.connect();
38+
nativeDriver = await AndroidNativeDriver.connect(flutterDriver);
39+
await nativeDriver.configureForScreenshotTesting();
40+
await flutterDriver.waitUntilFirstFrameRasterized();
41+
});
42+
43+
tearDownAll(() async {
44+
await nativeDriver.close();
45+
await flutterDriver.close();
46+
});
47+
48+
test('verify that HCPP is supported and enabled', () async {
49+
final Map<String, Object?> response =
50+
json.decode(await flutterDriver.requestData('')) as Map<String, Object?>;
51+
52+
expect(response['supported'], true);
53+
}, timeout: Timeout.none);
54+
55+
test('should screenshot a platform view with specified clippath', () async {
56+
await expectLater(
57+
nativeDriver.screenshot(),
58+
matchesGoldenFile('$goldenPrefix.complex_clippath.png'),
59+
);
60+
}, timeout: Timeout.none);
61+
62+
test(
63+
'should start with triangle cutoff on left, and toggle to no triangle cutoff on left',
64+
() async {
65+
await expectLater(
66+
nativeDriver.screenshot(),
67+
matchesGoldenFile('$goldenPrefix.complex_clippath.png'),
68+
);
69+
await flutterDriver.tap(find.byValueKey('ToggleTriangleClipping'));
70+
await expectLater(
71+
nativeDriver.screenshot(),
72+
matchesGoldenFile('$goldenPrefix.complex_clippath_no_triangle.png'),
73+
);
74+
},
75+
timeout: Timeout.none,
76+
);
77+
}

‎dev/integration_tests/flutter_gallery/pubspec.yaml

Copy file name to clipboardExpand all lines: dev/integration_tests/flutter_gallery/pubspec.yaml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies:
3737
url_launcher_web: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3838
url_launcher_windows: 3.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3939
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
40-
video_player_android: 2.7.17 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
40+
video_player_android: 2.8.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4141
video_player_avfoundation: 2.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4242
video_player_platform_interface: 6.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4343
video_player_web: 2.3.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -272,4 +272,4 @@ flutter:
272272
- asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf
273273
- asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf
274274

275-
# PUBSPEC CHECKSUM: 2b22
275+
# PUBSPEC CHECKSUM: e1ea

‎docs/tool/README.md

Copy file name to clipboardExpand all lines: docs/tool/README.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ with. A typical example would be:
187187
```yaml
188188
dependency_overrides:
189189
sky_engine:
190-
path: /path/to/flutter/engine/out/host_debug/gen/dart-pkg/sky_engine
190+
path: /path/to/flutter/engine/src/out/host_debug/gen/dart-pkg/sky_engine
191191
```
192192
193193
Replace `host_debug` with the actual build that you want to use (similar to `--local-engine`, but typically

‎engine/src/flutter/.clang-tidy

Copy file name to clipboardExpand all lines: engine/src/flutter/.clang-tidy
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ CheckOptions:
6060
# updated.
6161
#
6262
# tl;dr: I'm sorry.
63-
HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|vulkan|wasm|web_sdk)\/.*"
63+
HeaderFilterRegex: "[..\/]+\/flutter\/(assets|benchmarking|bin|build|ci|common|display_list|docs|examples|flow|flutter_frontend_server|flutter_vma|fml|impeller|lib|runtime|shell|skia|sky|testing|tools|txt|vulkan|wasm|web_sdk)\/.*"

‎engine/src/flutter/BUILD.gn

Copy file name to clipboardExpand all lines: engine/src/flutter/BUILD.gn
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ group("flutter") {
149149
"//flutter/impeller/geometry:geometry_benchmarks",
150150
"//flutter/lib/ui:ui_benchmarks",
151151
"//flutter/shell/common:shell_benchmarks",
152-
"//flutter/third_party/txt:txt_benchmarks",
152+
"//flutter/txt:txt_benchmarks",
153153
]
154154
}
155155

@@ -200,7 +200,7 @@ group("unittests") {
200200
"//flutter/testing/dart",
201201
"//flutter/testing/smoke_test_failure",
202202
"//flutter/third_party/tonic/tests:tonic_unittests",
203-
"//flutter/third_party/txt:txt_unittests",
203+
"//flutter/txt:txt_unittests",
204204
]
205205

206206
# The accessibility library only supports Mac and Windows at the moment.

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

Copy file name to clipboardExpand all lines: engine/src/flutter/ci/builders/linux_host_engine_test.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"flutter/shell/common:shell_benchmarks",
141141
"flutter/shell/testing",
142142
"flutter/tools/path_ops",
143-
"flutter/third_party/txt:txt_benchmarks"
143+
"flutter/txt:txt_benchmarks"
144144
]
145145
},
146146
"tests": [

‎engine/src/flutter/ci/builders/standalone/linux_benchmarks.json

Copy file name to clipboardExpand all lines: engine/src/flutter/ci/builders/standalone/linux_benchmarks.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"flutter/lib/ui:ui_benchmarks",
3434
"flutter/shell/common:shell_benchmarks",
3535
"flutter/shell/testing",
36-
"flutter/third_party/txt:txt_benchmarks",
36+
"flutter/txt:txt_benchmarks",
3737
"flutter/tools/path_ops",
3838
"flutter/build/archives:flutter_patched_sdk",
3939
"flutter:unittests"

‎engine/src/flutter/ci/licenses.sh

Copy file name to clipboardExpand all lines: engine/src/flutter/ci/licenses.sh
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ function verify_licenses() (
183183
echo "double-check that all newly added files have a BSD-style license"
184184
echo "header with the following copyright:"
185185
echo " Copyright 2013 The Flutter Authors. All rights reserved."
186-
echo "Files in 'third_party/txt' may have an Apache license header instead."
187186
echo "If you're absolutely sure that the change in license count is"
188187
echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
189188
echo "================================================================="

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.